GrindStuff
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 Robbin

Conflicts:
	Hoverboard/Library/assetDatabase3