more testy things
dis gun be tricky maff
Merge branch 'master' of https://github.com/iburinoc/LifeSim

Conflicts:
	src/life/threedee/Camera.java