Merge branch 'master' of github.com:dopefishh/martlubbers.net

Conflicts:
	hashes.txt

diff --cc hashes.txt
index 5bb6598,8358176..0000000
deleted file mode 100644,100644
--- 1/hashes.txt
--- 2/hashes.txt
+++ /dev/null
@@@ -1,17 -1,17 +1,0 @@@
- 8cef9eab6dd8240b2bc2ff73be74ddd2  ./dvorak.html
- ea76976ae5907455b64e6c2ee1fd49df  ./hashes.txt
- aeb73dde1dadf170d37784a3826a6f33  ./index.html
 -3d85a9b435eb833de088e45c3f56e49c  ./dvorak.html
 -9e5b7702d73bfb7febb24bf58f0e8d60  ./hashes.txt
 -641691d9c0ede8c0fad969af2d2e4017  ./index.html
--72ac29b74f3e09c551aa10a2a8d2581d  ./lejos-ubuntu.html
--0ba6cb2c3a9d7d8ba27406d215aa501e  ./mart@martlubbers.net.asc
--75068866762dc200d6e185bfe9b3a2bf  ./o.html
--ce31052406b3874b287e98c8a9477516  ./p.jpg
- 0bbec925190858f94330ed58d62eef4c  ./put.bash
 -e8a032f7db299973004f4baad35967a9  ./put.bash
--43eb61826bc538817b4c78c7f8d57019  ./README.md
--acaac946ac8dc79dc3896e74edbdd303  ./robots.txt
--d69f225d06c3d7a417fb5e8159efc2d1  ./test.php
--146f1bb6bed2adfd4d13f9644390db71  ./archive/nsa-dropbox.html
--2ed34aa229468632cce58151c33d1ebc  ./archive/wlan-debian.html
--d07dca8f45b3f046558216cf3ac96c28  ./archive/youtube-term.html
--dd13e096acf6b9b95cace6943fe56577  ./files/dvorak-0.74.map
--85f82d281bc3d4e48e375193fdaada66  ./files/dvorak_dos.tar
--b92c31cd0dfde6e6e8322d2163f0d728  ./files/phonetic_dvorak.gz

diff --cc index.html
Simple merge