Added end game screen
Merge remote-tracking branch 'origin/GameSettings' into GameSettings

Conflicts:
	client/src/GameSettings.cpp