Merge branch 'master' into ting/game_page
moved discard pile to the right
Merge branch 'ting/game_page'