Merge branch 'master' of https://github.com/kedromelon/modding_project into Will_develop

Conflicts:
	Assets/Scenes/Matt's scene Revamp.unity
Merge branch 'master' into noah_develop