saving best solution - fixes
Merge remote-tracking branch 'origin/test2' into test2

Conflicts:
	GameExercise2/SpaceShipsGame.cpp