Near Final Commit
Merge branch 'master' into Atlas

Conflicts:
	Assets/Prefabs/Player Character.prefab