wat
Merge branch 'master' of github.com:addtheletters/space

Conflicts:
	bin/glTest/EntityTest.class
	bin/glTest/TestGraphics.class