no message
Merge branch 'master' of https://github.com/michael21115/MuseumThief into harry
addition of changes in camera script to send out ray cast
Merge branch 'master' of https://github.com/michael21115/MuseumThief into harry

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefabs/CamConsolidated_Harry.prefab
Merge branch 'master' of https://github.com/michael21115/MuseumThief into harry

Conflicts:
	GIT-Harry-csharp.sln
	GIT-Harry.sln
Merge branch 'master' of https://github.com/michael21115/MuseumThief into floorGen

Conflicts:
	Assets/Scripts/guard.cs
Merge branch 'floorGen' of https://github.com/michael21115/MuseumThief into floorGen

Conflicts:
	Assets/Prefabs/CamConsolidated_Harry.prefab
Pre-pull commit
Merge branch 'floorGen' of https://github.com/michael21115/MuseumThief into floorGen

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefabs/CamConsolidated_Harry.prefab
	Assets/Prefabs/GuardCondensed.prefab
	Assets/Prefabs/thief.prefab
	Assets/Scenes/MuseumGeneration.unity
	Assets/Scripts/guard.cs
Pre-merge commit
Should have door
Merge branch 'harry' of https://github.com/michael21115/MuseumThief into floorGen

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefabs/security guard.prefab.meta
	Assets/Scripts/CameraRotation4.cs
	Assets/Scripts/CameraRotation4.cs.meta
Added, Mummy, Rock, and Freakguy prefab
Merge branch 'harry' of https://github.com/michael21115/MuseumThief into floorGen

Conflicts:
	Assembly-CSharp-vs.csproj
	Assets/Models/security guard.prefab
	Assets/Prefabs/FREAK GUY.prefab.meta
new rock
Merge branch 'harry' of https://github.com/michael21115/MuseumThief into floorGen
added win screen in a new scene
Pre-Merge Commit
Merge branch 'master' of https://github.com/michael21115/MuseumThief into floorGen
Final Push: Level Indicator functional, Win Screen set. Minor bugs still present, nothing too major.