MEH
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Jump.cs
what
Merge remote-tracking branch 'origin/Erik' into Niklas

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Jump.cs