asd
asd
Grind
asd
as
Merge remote-tracking branch 'origin/Niklas' into Erik

Conflicts:
	Hoverboard/Assets/Prefabs/Hoverboard 3.4.prefab
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
Fixed so we now can grind on multiple rails
Grind
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
Merge remote-tracking branch 'origin/Niklas' into Erik

Conflicts:
	Hoverboard/Assets/Script/Obstacles/TriggedObjects/Rails/Grindable.cs
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
Merge remote-tracking branch 'origin/Erik' into Niklas

Conflicts:
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
Merge Erik
Merge remote-tracking branch 'origin/Erik' into Niklas

Conflicts:
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
Merge branch 'Niklas'

Conflicts:
	Hoverboard/Assets/Scenes/Niklas.unity
	Hoverboard/Assets/Script/Character/HoverBoard/Jump.cs
	Hoverboard/Hoverboard-csharp.sln
	Hoverboard/Hoverboard.sln
	Hoverboard/Library/assetDatabase3
Merge branch 'master' of https://github.com/Raful/Hoverboard