no message
Merge branch 'master' of https://github.com/michael21115/MuseumThief

Conflicts:
	Assets/Prefabs/Floor Tile Obstacle.prefab
	Assets/Prefabs/security guard.prefab
	Assets/Scripts/guard.cs
	MuseumThief-csharp.sln
	MuseumThief.sln
	MuseumThief.userprefs
Minor adjustments to the guard and thief, set final thief to spawn rather than stand-in. Several minor adjustments to code.
Merge branch 'master' of https://github.com/michael21115/MuseumThief

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Models/Player 1.prefab
	Assets/Prefabs/Back Wall Door.prefab
	Assets/Prefabs/Corner Door.prefab
	Assets/Prefabs/Floor Tile Obstacle.prefab
	Assets/Prefabs/security guard 1.prefab.meta
	Assets/Prefabs/security guard.prefab
	Assets/Scenes/MuseumGeneration.unity
	Assets/Scripts/guard.cs
Unstable push: various bugs
Adjustments to things
Merge branch 'master' of https://github.com/michael21115/MuseumThief

Fixed issues mentioned. Guards turn and are shaded properly, player model is inserted, keycard works and enemy spawn is fixed.