大转盘
Merge branch 'master' of https://github.com/ggcoke/CTGame

Conflicts:
	res/layout/activity_home.xml
	res/values/color.xml
	res/values/strings.xml