stage
Merge branch 'master' of https://github.com/jyc8/Indie-Time

Conflicts:
	Assets/Scenes/New Scene.unity