加入logo
加入结算界面
增加弹窗
Merge branch 'master' of https://github.com/firegames/test

Conflicts:
	2048/Class/View/GameView.m