update game ui
update game ui again
fix conflict
Merge pull request #21 from Ryeeeeee/master

merge wuhao