testing zach
working on this box thing
Merge branch 'master' of github.com:addtheletters/space

Conflicts:
	bin/glTest/EntityTest.class
mouse-over targeting system