Behöver grejer ifrån master
...
Merge branch 'master' of https://github.com/Raful/Hoverboard into Pontus

Conflicts:
	Hoverboard/Assets/Prefabs/Hoverboard 3.4.prefab
	Hoverboard/Assets/Scenes/Wolfie.unity.meta
asdasdasd
Merge branch 'master' of https://github.com/Raful/Hoverboard into Pontus

Conflicts:
	Hoverboard/Assets/Prefabs/Hoverboard 3.4.prefab
derp
Merge branch 'master' of https://github.com/Raful/Hoverboard into Pontus

Conflicts:
	Hoverboard/Assets/Prefabs/Character/Hoverboard 4.0.prefab
	Hoverboard/Hoverboard-csharp.sln
	Hoverboard/Hoverboard.sln
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
	Hoverboard/ProjectSettings/EditorBuildSettings.asset