IP testing.
Merge branch 'master' of github.com:kberger/serpent
Merge branch 'master' of github.com:kberger/serpent
ENCRYPT AND DECRYPT 99% DONE MUTHALICKA!
Merge branch 'master' of github.com:kberger/serpent

Conflicts:
	src/Serpent.java