Trying to make collision work.
Merge branch 'pacman' of https://github.com/iburinoc/LifeSim into pacman

Conflicts:
	src/life/threedee/game/Player.java
Merge branch 'temp' into pacman