la till en massa couts so I know where shit are
Merge branch 'master' of https://github.com/flanr/Frogger

Conflicts:
	Frogger/GameObject.cpp
	Frogger/GameState.cpp