-
Merge remote-tracking branch 'origin/Front-end-design'

Conflicts:
	twofish/__init__.pyc
	twofish/twofish.pyc
	twofish/twofish_cbc.pyc
	twofish/twofish_ecb.pyc
	vault.pyc