Merge branch 'master' of https://github.com/awardell/SuperAwesomeGhostGame

Conflicts:
	purgatoryUnity/Assets/Scenes/Level02.unity