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
When you press the reset button, you now reset the game state, rather than loading a new scene (takes a lot less time)
Bugfix: you no longer bounce back slightly when colliding with a solid object.
Removed some Debug.Log() calls
Bugfix: collision now works from all sides (oops :P)
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
Bugfix: Collision now works when going backwards
Rails
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Assets/Prefabs/Character/Hoverboard 4.0.prefab
	Hoverboard/Assets/Script/Character/HoverBoard/Jump.cs
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Assets/Scenes/grindtest.unity
	Hoverboard/Assets/Script/Character/HoverBoard/Jump.cs
	Hoverboard/Assets/Script/Obstacles/StateTriggers/Rails/Grindable.cs