Merge remote-tracking branch 'github/master'

Conflicts:
	deploy.sh
	hashcash.php
	readme.txt