removed the call of the mainmenu gamestate
Merge branch 'master' into sound
sound now crossfading
Merge branch 'sound'