fuk u
Merge branch 'master' of https://github.com/miolsem/GameJamMask.git

Conflicts:
	Assets/Player.cs
	Assets/level.meta
	Assets/level/level01.max.meta
	Assets/level/level_01.FBX.meta
	Assets/level/textures.meta
	Assets/level/textures/seamless_tile_floor_1_by_ttrlabs-d4ojzlu.png.meta
	Assets/level/textures/white_wall.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/expandedItems
	Library/guidmapper
	Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	Library/metadata/23/2321eaaebbc68e14eac441679f8c04f8
	Library/metadata/5d/5d69df9d9d11e49d110086ba44295342
	Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	Library/metadata/95/95b08d69b6eea9a48b251a55ddadc437
	Library/metadata/c2/c278d3fba2eb35c4289e55761ffec056
	Library/metadata/c3/c339817cdeb35674da8b2ac52d5599d7
	ProjectSettings/InputManager.asset
Tons of code changes

ask tyler if theres a problem

but plz don't for real
Merge branch 'master' of https://github.com/miolsem/GameJamMask.git
new stuff
Merge branch 'master' of https://github.com/miolsem/GameJamMask.git
yooo
Merge branch 'master' of https://github.com/miolsem/GameJamMask.git

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Materials/gray-tile-texture.png.meta
	Assets/Scene1.unity
	Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/FireMask_Mask.fbx.meta
	Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Materials/WhiteColorwithcolor12.mat.meta
	Assets/level/Materials.meta
	Assets/level/Materials/MetalTexturespec copy.mat
	Assets/level/Materials/MetalTexturespec copy.mat.meta
	Assets/level/Materials/STEAMPUNK DOOR-1.mat
	Assets/level/Materials/STEAMPUNK DOOR-1.mat.meta
	Assets/level/Materials/cage.mat.meta
	Assets/level/Materials/door_02.mat.meta
	Assets/level/Materials/gray-tile-texture.mat
	Assets/level/Materials/gray-tile-texture.mat.meta
	Assets/level/box.FBX.meta
	Assets/level/cage.FBX.meta
	Assets/level/default_rectangle.FBX.meta
	Assets/level/door.FBX.meta
	Assets/level/level01_2.max.meta
	Assets/level/level01_3.max.meta
	Assets/level/level02.max.meta
	Assets/level/level02_2.max.meta
	Assets/level/level_01.FBX.meta
	Assets/level/level_01.fbm.meta
	Assets/level/level_01.fbm/Erroded_Metal_Blue_Spots_Rust_UV_CM_1.jpg.meta
	Assets/level/level_01.fbm/MetalTexturespec copy.jpg.meta
	Assets/level/level_01.fbm/gray-tile-texture.png.meta
	Assets/level/level_01.fbm/seamless_tile_floor_1_by_ttrlabs-d4ojzlu.png.meta
	Assets/level/switch.FBX.meta
	Assets/level/textures/BlueTiles2560x1600.png.meta
	Assets/level/textures/Erroded_Metal_Blue_Spots_Rust_UV_CM_1.jpg.meta
	Assets/level/textures/MetalTexturespec copy.jpg.meta
	Assets/level/textures/STEAMPUNK DOOR-1.jpg.meta
	Assets/level/textures/Tiki_QSL-57547.jpg.meta
	Assets/level/textures/door.jpg.meta
	Assets/level/textures/metal doors 3-4.jpg.meta
	Assets/level/textures/tile_texture3081.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/3e/3e4fb70d1fdd74146ae9ceb3ce4afabe
	ProjectSettings/InputManager.asset
Merge branch 'master' of https://github.com/miolsem/GameJamMask.git