password and nonce stuff was bad
Merge branch 'master' of github.com:kisom/crypto_intro

Conflicts:
	doc/pycrypto.md
	doc/pycrypto.pdf
	doc/pycrypto.tex