Merge branch 'ting/game_page'
Merge branch 'ting/game_page'
Merge branch 'ting/game_page'
Merge branch 'ting/game_page'
just a couple bug fixes
conflicts resolved
conflicts resolved