fixed game display and intitialization issues when a new game was started after an old one
fixed merge conflict in game.java