jeff changes
Merge branch 'master' of https://github.com/monkifiery/TextCrypt

Conflicts:
	TextCrypt/src/hackerjacks/textcrypt/Decrypt.java