Merge remote-tracking branch 'origin/master' into Vulk

Conflicts:
	Assets/Resources/Materials/BackgroundLevel2.mat.meta
	Assets/Resources/Scenes/Level2.unity
	Assets/Resources/Textures/BackgroundStage1.png.meta
	Library/EditorUserBuildSettings.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/06/06e913341cd9683479ca9aac0634e41b
	Library/metadata/0a/0a43ac086ccb8624d9fd8d7b0e133d7f
	Library/metadata/22/224ff7df319f9cf4d8b5f8ef319b102b
	Library/metadata/38/388b7a99779220c48899d3d3167a2209
	Library/metadata/3d/3dcd9296b9130884ca12c55e7fbbcebe
	Library/metadata/4a/4ac816855bd74d945bb6a9f52948bc9a
	Library/metadata/4d/4d13c20df509f2345a70c66da4945858
	Library/metadata/50/50bd7784160850340b8f85ffa5c675b0
	Library/metadata/5d/5d6daeed427ebc44d804728ae123577d
	Library/metadata/63/63cbe8af3b3902e4d8a5df5c9e8bf88f
	Library/metadata/82/823ee318735e6bb4cbb053c7881e7c4c
	Library/metadata/92/92f97bdae8ea24844800e9476f0a6851
	Library/metadata/94/94e94a2c9b119d941a0f59730f0b3258
	Library/metadata/ac/accd0f87b9b37ac4e99f83132b2d05c4
	Library/metadata/b0/b0b13b0fa430d7a41b2dbb126aa0ab10
	Library/metadata/b6/b680980595e31d74386f0d54e154757d
	Library/metadata/d4/d4e034ca5c1bc9c4ebcb48b3fb02ddf3
	Library/metadata/d6/d66a4546c25aa684db55a1c3cd524ba5
	Library/metadata/e3/e3a49053959110449871f6ff7e68479b
jump icecream
hej
hi
Save progress
Merge remote-tracking branch 'origin/Vulk'

Conflicts:
	Assets/Resources/Animations/ArrowAnimation.anim.meta
	Assets/Resources/Materials/BackgroundLevel2.mat.meta
	Assets/Resources/Objects/Collider.prefab.meta
	Assets/Resources/Scenes/Level2.unity
	Library/EditorUserBuildSettings.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/06/06e913341cd9683479ca9aac0634e41b
	Library/metadata/22/224ff7df319f9cf4d8b5f8ef319b102b
	Library/metadata/38/388b7a99779220c48899d3d3167a2209
	Library/metadata/3d/3dcd9296b9130884ca12c55e7fbbcebe
	Library/metadata/4a/4ac816855bd74d945bb6a9f52948bc9a
	Library/metadata/4d/4d13c20df509f2345a70c66da4945858
	Library/metadata/50/50bd7784160850340b8f85ffa5c675b0
	Library/metadata/5d/5d6daeed427ebc44d804728ae123577d
	Library/metadata/63/63cbe8af3b3902e4d8a5df5c9e8bf88f
	Library/metadata/92/92f97bdae8ea24844800e9476f0a6851
	Library/metadata/ac/accd0f87b9b37ac4e99f83132b2d05c4
	Library/metadata/b0/b0b13b0fa430d7a41b2dbb126aa0ab10
	Library/metadata/d4/d4e034ca5c1bc9c4ebcb48b3fb02ddf3
	Library/metadata/d6/d66a4546c25aa684db55a1c3cd524ba5