Changes to SimonGameModel/ screen and GameOverScreen
Merge