Branching Francisco
Testing Branching Thing
added end screen
Merge branch 'master' of https://github.com/michael21115/MuseumThief into haleysGuard

Conflicts:
	Assets/Prefabs/security guard.prefab
	Assets/Scripts/guard.cs
Merge pull request #11 from michael21115/haleysGuard

Haleys guard
Added Exit Sign and Key w/ Particle in PreFabs
Merge branch 'master' of https://github.com/michael21115/MuseumThief
added mona lisa
added key obtained sound
added footsteps sound
added alarm sound
added cell door closing sound (probably play it after the alarm)
added guardians of the galaxy come and get your love wav file
Merge branch 'master' of https://github.com/michael21115/MuseumThief into Francisco

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Materials/lambert1.mat
	Assets/Scenes/MuseumGeneration.unity
	Assets/Scripts/guard.cs
Tweaked floor gen code. Now accounts for varying sized rooms and obstacle arrays, spreads things around. Fixed Guards again
Merge branch 'Francisco' of https://github.com/michael21115/MuseumThief into Francisco

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefabs/WidthWallMaya.prefab
	Museum Thief-csharp.sln
	Museum Thief.sln
	Museum Thief.userprefs