10:00 monday night
Merge branch 'ting/game_page'
conflicts resolved
removed style.css
Merge branch 'master' into ting/game_page
fixed hand cards style