stage 1
Merge branch 'master' of https://github.com/nodoxi/phobia

Conflicts:
	Assets/Scenes/Game.unity