Deleted my local changes
Merge branch 'master' of https://github.com/rstaewen/Pharos

Conflicts:
	Assets/Levels/new_michael_level/Nintendoghost.FBX.meta
	Assets/Levels/new_michael_level/hammer.obj.meta
	ProjectSettings/ProjectSettings.asset