GUID
Merge branch 'master' of https://github.com/SevenStringArgs/CweetSixteen

Conflicts:
	src/test/DBguid.java