Merge branch 'master' into ting/game_page
clicking on a Hand card moves it to play area
moving Hand card to play area - time delay
Merge branch 'ting/game_page'
resolved conflict