Player vs world collision is half-way done.
Merge branch 'master' of https://github.com/henry4k/apoapsis

Conflicts:
	src/Game.cpp
	src/Player.cpp