Added a gamescreen
Merge branch 'master' of github.com:broding/TheNerdyGames

Conflicts:
	NerdyGame/NerdyGame/main.cpp
moved the standardobject to the gamscreen
Merge branch 'master' of github.com:broding/TheNerdyGames
changed the update back