pull from origin
Merge pull request #25 from yonghaoy/main_game

pull from origin