Renaming game.gameSize to game.size
Merging changes