change stuff
Merge branch 'master' of https://github.com/DanGrenade/NotPassage

Conflicts:
	Immortal/Assets/GameScene.unity

sdfasfsfsdffsd