Added game pausing and controller input for states besides the gamestate(bug found, if you press the A button in one of the screens to switch back to the game, if your character is on the ground, your character will jump)
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/Debug/GoliathGame.exe
	GoliathGame/Debug/GoliathGame.pdb
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo