merging
Merge branch 'master' of https://github.com/zrrz/A_Blast

Conflicts:
	Assets/CameraFollow.cs
	Assets/Main.unity