Knapsack
Merge branch 'master' of github.com:lynyus/cryptography

Conflicts:
	README.md