many changes
Merge branch 'master' of https://github.com/5-second-rule/game into restart_remove_on_death

Conflicts:
	game-core/GameState.cpp
	game-core/Player.cpp
	game-core/PlayerMovingObject.cpp
it works
Merge pull request #42 from 5-second-rule/restart_remove_on_death

Restart remove on death