Merge branch 'master' of https://github.com/thenomad/MuseumHeist

Conflicts:
	Library/metadata/ff/ff7b61b20647c7e4592b8e4fe56e80f2
	MuseumHeist-csharp.sln
	MuseumHeist.sln
	MuseumHeist.userprefs
	Temp/StagingArea/Untitled.app/Contents/Data/Managed/Assembly-CSharp.dll
	Temp/StagingArea/Untitled.app/Contents/Data/Managed/Assembly-CSharp.dll.mdb
	Temp/StagingArea/Untitled.app/Contents/Data/Managed/Assembly-UnityScript.dll
	Temp/StagingArea/Untitled.app/Contents/Data/Managed/Assembly-UnityScript.dll.mdb
	Temp/StagingArea/Untitled.app/Contents/Data/level0
	Temp/StagingArea/Untitled.app/Contents/Data/mainData
	Temp/StagingArea/Untitled.app/Contents/Data/resources.assets
	Temp/StagingArea/Untitled.app/Contents/Data/sharedassets0.assets
	Temp/StagingArea/Untitled.app/Contents/Data/sharedassets1.assets
	Temp/UnityTempFile-1f47e3abb0962423d9d6b3e90f6a80bb
	Temp/UnityTempFile-7deea01ac915c4393ad02ede83c38f3e
	Temp/UnityTempFile-7e77184b862af4ce789d4b45d595e96a
	Temp/UnityTempFile-8e47a366b34594e4395ef20af3fba044
	Temp/UnityTempFile-f633833c6a24b40b4b76afe0e36305da
	Temp/__EditModeScene
t
x