Functions and vars for dealing with speed conversion and frame counting has been added to App class
Merge branch 'master' of https://github.com/Crismis333/SpaceGameJam

Conflicts:
	SpaceGame/App.cpp
	SpaceGame/App.h