Not sure what i changed (probably nothing)
Merge branch 'master' of https://github.com/zhanhuang/SuperMassiveBlackhole

Conflicts:
	Assets/Resources/Player.prefab