Putting in dialogue for script
Merge branch 'master' of https://github.com/NightSchoolStudio/Oxenfree

Conflicts:
	Assets/Oxenfree/Resources/DialogPackages/ScratchScene.asset
	Assets/Shared/Standard Assets/Projectors/Sources/Materials.meta
Merge branch 'master' of https://github.com/NightSchoolStudio/Oxenfree

Conflicts:
	Assets/NightTools