Fixed bug with getting in-line password
Decrypt function prompted for password
when it has already been provided in command
Merge remote-tracking branch 'upstream/master'

Conflicts:
	wordcrypt.py
Save before merging
Merge branch 'master' of https://github.com/hyunmoon/wordcrypt

Conflicts:
	wordcrypt.py