small changes merge
Merge branch 'master' of https://github.com/zrrz/A_Blast

Conflicts:
	Assets/Scripts/GravityConsole.cs