Some timer fixes
Fixed conflic and now timer works

Conflicts:
	Game.cpp