FBX formatted
Small map added
Merging
Merge remote-tracking branch 'GitHub/dillon_branch' into Dylan

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Artwork/Models/Castle.ma.meta
	Assets/Artwork/Models/Lighthouse.ma.meta
	Assets/Prefabs/RainPrefab.prefab
	Assets/Prefabs/RainPrefab.prefab.meta
	Assets/Prefabs/blackTile_1.prefab
	Assets/Prefabs/sandTile_1.prefab
	Assets/Prefabs/whiteTile_1.prefab
	Assets/Scenes/Bigger_Map.unity
	Assets/Scenes/Bigger_Map.unity.meta
	Assets/Scenes/main_map_1.unity
	Assets/Scripts/FloodGenerator.cs
	Assets/Standard Assets/Particles/Water/Rain.prefab
Whats happening
Merge remote-tracking branch 'origin/Dylan' into Dylan

Conflicts:
	Assets/Scripts/FloodGenerator.cs
	Assets/Scripts/InitializeTiles.cs
	Assets/Standard Assets/Particles/Water/Rain.prefab
	Game Dev Final-csharp.sln
	Game Dev Final.sln
General update commit
Merge remote-tracking branch 'origin/Lauren_branch' into Dylan

Conflicts:
	Assets/Artwork/Models/Castle.ma.meta
	Assets/Artwork/Models/Lighthouse.ma.meta
	Assets/Prefabs/RainPrefab.prefab
	Assets/Prefabs/RainPrefab.prefab.meta
	Assets/Prefabs/blackTile_1.prefab
	Assets/Prefabs/sandTile_1.prefab
	Assets/Prefabs/whiteTile_1.prefab
	Assets/Scenes/Bigger_Map.unity
	Assets/Scenes/Bigger_Map.unity.meta
	Assets/Scenes/main_map_1.unity
	Assets/Scripts/FloodGenerator.cs
+update w/ individual tower effects
+preliminary setup on weather effects (not ready yet)
Added highlighting scripts as well as revised tile prefabs to accommodate.
Merge remote-tracking branch 'origin/dillon_branch' into Dylan

Conflicts:
	Assets/Scenes/Bigger_Map.unity
	Assets/Standard Assets/Particles/Dust.meta
	Assets/Standard Assets/Particles/Misc.meta
Merge remote-tracking branch 'origin/Lauren_branch' into Dylan
Merge commit 'f1af6080f6c74f7efaf1fec9180179a681726db0' into Lauren_branch

Conflicts:
	Assets/Scenes/Bigger_Map.unity

Title Screen, End Score Screen, Video that doesn't work, GUI all -10