Merge branch 'master' into ting/game_page
Log gainCard and trashCard
Merge branch 'ting/game_page'
conflicts resolved