mostly working crypto
Merge branch 'master' of https://github.com/clarkds/6858-final-project

Conflicts:
	client/crypto.py