fixing merge
removed game.html from master