I think this is the right way to do this :) fixes #7
Merge remote-tracking branch 'telehash/master'

Conflicts:
	lib/crypt.h