Fixed merge of T4 into master
Merge branch 'master' of https://github.com/johnhof/Applied-Cryptography

Conflicts:
	GroupThread.java