fu kuuuu
Merge branch 'master' of https://github.com/miolsem/GameJamMask.git

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Resources/Materials/DashMural.fbx.meta
	Assets/Resources/Materials/FireMural.fbx.meta
	Assets/Resources/Materials/Materials.meta
	Assets/Resources/Materials/Materials/Dash.mat.meta
	Assets/Resources/Materials/Materials/FireMaskMural.mat.meta
	Assets/Resources/Materials/Materials/StrengthMural.mat.meta
	Assets/Resources/Materials/Materials/TruthMaskMural.mat.meta
	Assets/Resources/Materials/StrengthMural.fbx.meta
	Assets/Resources/Materials/TruthMural.fbx.meta
	Assets/Room1.unity
	Assets/Scripts/ObjectSelector.cs
	Assets/level/Animation.meta
	Assets/level/Animation/wall_destroy.fbx.meta
	Assets/level/Animation/wall_destroy.mb.meta
	Assets/level/Materials/Texture_Wall_Cracked_by_Ivette_Stock.mat
	Assets/level/Materials/Texture_Wall_Cracked_by_Ivette_Stock.mat.meta
	Assets/level/textures/SCIFI COVER  E 0036.jpg697191d0-0648-4a37-a004-83b09472d7b2Larger.jpg.meta
	Assets/level/textures/Texture_Wall_Cracked_by_Ivette_Stock.jpg.meta
	Assets/level/textures/Watercolour_Paper_Texture_by_winryie.jpg.meta
	Assets/level/textures/seamless-white-texture.jpg.meta
	Assets/level/textures/white-garage-door-texture.jpg.meta
	Assets/level/wall_sliced up.FBX.meta
	Assets/level/wall_sliced up.fbm.meta
	Assets/level/wall_sliced up.fbm/MetalTexturespec copy.jpg.meta
	Assets/level/wall_sliced up.fbm/Texture_Wall_Cracked_by_Ivette_Stock.jpg.meta
	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/assetDatabase3
	Library/guidmapper
	Library/metadata/0c/0c11bcd4261ff104f9bd3b8cc9fcfde7
	Library/metadata/2b/2bace84212e517b45943bd4e25c0ef7c
	Library/metadata/4c/4c07174bea6e74847a73e5d937c378cf
	Library/metadata/6c/6cf255bae7bd6a1428425fc69cb7ba5d
	Library/metadata/77/77ca46e4213b9b94aad6acadacd7fe14
	Library/metadata/b0/b0803258902e96f47aee983cc066f5af
	Library/metadata/d9/d974bb3fe2743c0468c15a4428393198
Merge branch 'master' of https://github.com/miolsem/GameJamMask.git