reverted changes to gameover
fixed merge conflictMerge branch 'master' of github.com:Senney/CPSC599-RPG

Conflicts:
	src/cpsc599/states/GameOverState.java