玩应用首页
解决冲突
Merge branch 'master' of https://github.com/ggcoke/CTGame

Conflicts:
	res/drawable-hdpi/wheel1.png