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

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
Merge branch 'master' of github.com:qg351605753/colorhit

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
update
fix bugs