test
test
Merge branch 'master' of https://github.com/qg351605753/colorhit

Conflicts:
	.gitignore
	Assets/Script/GameName.cs