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

Conflicts:
	Game/Game/Jeep.cpp
Merge pull request #29 from festen/collision-detection

Collision detection
added a turret, to be moved with Z and X keys
shooting in a bow
Merge remote-tracking branch 'origin/add-turret' into shoot

Conflicts:
	Game/Game/Jeep.cpp
Shooting in a trajectory **should** now work