Merge commit '6840998a9c92421b3c33c61b39c81101fd977518' into Lauren_branch

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefabs.meta
Merge commit 'd6c9f52e2bd82c6f14fcaec49103f84e6799ef50' into Lauren_branch

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefabs.meta
+update with additional assets/scripts
random tile updates
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
Added castle, lighthouse, and pyramid models
Merge remote-tracking branch 'GitHub/Lauren_branch' into Dylan