Merge pull request #1 from aleung013/game

Game
Merge branch 'master' into game