added flickering lights, moved and changed a ton of prefabs... I REALLY hope this doesn't break everything
Merge branch 'March7Develop' of https://github.com/AndrewBrough/projectmidnight into March7Develop

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/28/2846c3adf33322c49999ce4f156bfe1e
	Library/metadata/49/49c0e9cc1ebeda045b87ea2ea445537a
	Library/metadata/7e/7e9160f7995bb8c44b48eb99cee29ad2
	Library/metadata/82/82ad4ac7e6a18b147994d5373408afe1
	Library/metadata/ad/ad46e26bcfc99b149a77ce6cf532c82e
	Library/metadata/b8/b814675adf9261e449175f9981db8aa2
	Library/metadata/bd/bd57d06d598386a4995018b247bdd569
modified several prefabs, changed ability to hold any object tagged "holdable"
Merge branch 'March7Develop' of https://github.com/AndrewBrough/projectmidnight into March7Develop

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/0a/0a65b834b3eb3a444876f9c697437988
	Library/metadata/12/128cab90fea73420aa409507c0e27b6c
	Library/metadata/1f/1f7b4f4f94d8e804e8935b58e291d6ba
	Library/metadata/26/260afd3a1319b49318ebf6af6261ac84
	Library/metadata/27/279a1e8a92d231a4099dee843f5444e3
	Library/metadata/3f/3fad6a63c58b60a48bd158550b8e2af9
	Library/metadata/40/40b6f66b826d42c4b888d6111279451c
	Library/metadata/48/48f9606203aed4142b38a4881732cc2e
	Library/metadata/49/49c0e9cc1ebeda045b87ea2ea445537a
	Library/metadata/49/49ca4b7bdf10aa54593e263cf539b979
	Library/metadata/51/51cebbf0e249a4fd2b3084bfc171a864
	Library/metadata/58/58c48bcee99063743822c4c9c99aaafb
	Library/metadata/59/59140f2a00d4e4340b7244a8539a1081
	Library/metadata/64/64705fc5b9d657149802d37788fa55cd
	Library/metadata/67/67a2683ccb203c944b75ee27dfb8a8b9
	Library/metadata/6a/6a1ce4827464b405d9881b19b9f4f361
	Library/metadata/6f/6f930337668fde642bd44693ada0182c
	Library/metadata/80/80500376e0140594ab4136648501388b
	Library/metadata/83/8301ab2ba9d6a0845bf8cd3e54f8db41
	Library/metadata/a0/a0e5488cc99e549a898e05529c440177
	Library/metadata/a3/a332f857852a84cda84a4799b738b383
	Library/metadata/b0/b0409c221966b478fb97afad6dd43415
	Library/metadata/b8/b814675adf9261e449175f9981db8aa2
	Library/metadata/c4/c456a1a3764b9440c8b961e2ae25538b
	Library/metadata/ca/ca1d2d04a5602b04baac58bd3272524e
	Library/metadata/de/de489f1a026151d448e71899614fbe70
	Library/metadata/e1/e1da30c5417edc64f8005f9a77c62d6a
	Library/metadata/e2/e2d3d6762d95b5740ad10b2c2dd4e8c9
	Library/metadata/ed/edcc3392311fa294f868a9d892b30442
	Library/metadata/fe/fe0e079e1809e4021aaca1c251a748a4
	ProjectSettings/QualitySettings.asset
so many changes i don't even know what to type here. flickering lights and small crates everywhere, changed mouse sensitivity, changed lots more. Note: Disabled the music trigger in level 01 just for recording purposes. can reenable whenever.