+update with additional assets/scripts
Merge commit '793c2f57566a944a5ff92fe81be25552faaf9836' into Lauren_branch

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/main_map_1.unity
	Assets/Scripts/DylanGenerator.cs
	Assets/Sounds.meta
	Assets/Sounds/Music for final.wav.meta