Merge branch 'master' of https://github.com/hyunmoon/wordcrypt

Conflicts:
	wordcrypt.py
Merge remote-tracking branch 'upstream/master'

Conflicts:
	wordcrypt.py