...
Merge branch 'master' of http://github.com/TheBB/lock

Conflicts:
	aes.hs