Renamed deltaTime to timeFrame
Merge branch 'master' of https://github.com/henry4k/apoapsis

Conflicts:
	src/Map.cpp
	src/Player.cpp