16:27 Commented out the debug.log for m_jumpPower
16:29 Don't know what happend
16:50
asd
09:57
Merge branch 'Niklas'

Conflicts:
	Hoverboard/Assets/Scenes/Niklas.unity
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Hoverboard.userprefs
10:04
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Hoverboard.userprefs
13:17
13:24
FUCK THIS
Merge branch 'Erik' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Hoverboard.userprefs
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/assetDatabase3
GOIH
14:16 Merge error fix
Some more merge conflicts
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
14:33, nu funkar allt igen
16:22
16:25, spacebar release is now fixed
16:50, created script for line after hoverboard