Branching Francisco
Testing Branching Thing
no message
Merge branch 'master' of https://github.com/michael21115/MuseumThief into harry
addition of changes in camera script to send out ray cast
made a good pivot point for thief (at least i think i did let me know if it's no good). also added their to prefabs and models. and added mona lisa as the painting he steals
movement on camera is completely fixed. also player doesn't leave center of tile anymore
Various minor changes; worked a bit more on polish
Merge commit '49b64a252633eebf0cc4ab46e0c4ba6d62de8154' into floorGen

Conflicts:
	Assets/Models/thief.ma
	Assets/Models/thief.ma.meta
	Assets/Models/thief/thief.ma
	Assets/Models/thief/thief.ma.meta
	Assets/Scripts/Movement.cs
	Assets/thief/thief.ma
	Assets/thief/thief.ma.meta
Merge commit 'aec36f091e9a747778df3cf258cafbba6a850dec' into floorGen

Conflicts:
	Assets/Scenes/MuseumGeneration.unity
Added randomized Obstacle spawning
Guards don't spawn on the front row or on top of each other
Merge branch 'floorGen' of https://github.com/michael21115/MuseumThief into floorGen
Minor modifications; potential issue with keycard spawning in the wrong place
End of night push - minor modifications
First Playtest Push
GameStart Added
Merge branch 'floorGen' of https://github.com/michael21115/MuseumThief into floorGen

Conflicts:
	Assets/Scripts/startGame.cs
Added Glass Shader.
Merge branch 'master' of https://github.com/michael21115/MuseumThief into harry

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefabs/CamConsolidated_Harry.prefab