HEJ
Merge remote-tracking branch 'origin/Niklas' into Erik

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Jump.cs
MEH
DON*T KNOW
DONTNTNTN
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
Added wall jumping and fixed a bug when jumping. Extra: A bug exists when a person tries to jump from a wall exaktly when she swaps from grund/air to wall state
Removed the library folder from my branch
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik
Fix with bouncing bug
Merge
AGAIGAG
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
	Hoverboard/Library/assetDatabase3
Merge branch 'Niklas'
Implemented some animations + fix to collision
Merge branch 'master' into Robbin

Conflicts:
	Hoverboard/Assets/Script/Character/DetectState/AirKeyState.cs
	Hoverboard/ProjectSettings/EditorBuildSettings.asset