Mer Grind
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Assets/Scenes/Niklas.unity
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
Rails
Merge branch 'master' of https://github.com/Raful/Hoverboard into iteration3

Conflicts:
	Hoverboard/Assets/Script/Character/DetectState/MoveKeyState.cs