Scene update
Merge branch 'master' of https://github.com/NightSchoolStudio/Oxenfree

Conflicts:
	Assets/Oxenfree/Art/Demo/Materials/demo_midground.mat