change buttons, create show card
update merge gemlock
modified game controller
Merge branch 'master' into views