pre merge
Merge branch 'master' of github.com:eudemonia-research/cryptonet

Conflicts:
	cryptonet/standard.py