fixed bug with green object
Merge branch 'master' into collision-detection

Conflicts:
	Game/Game/Jeep.cpp