jump
merge
Merge branch 'master' of https://github.com/Raful/Hoverboard into wolfie

???????
what happened here?
monday morning merge
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
MEH
Rails
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Assets/Script/Character/DetectState/GrindKeyState.cs
Removed ignored files
tuesday morning merge
MEH
Movement
Merge remote-tracking branch 'origin/Erik' into Niklas
Need to do this to change to master
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
Merge branch 'Erik'

Conflicts:
	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 wolfie

"i'm updating!"