2spooky4me
Merge branch 'master' of https://github.com/kusaibito/assign3

Conflicts:
	DES.java