color add
Merge remote-tracking branch 'origin/master2' into master2

Conflicts:
	[Scene]/ShootingGame.unity