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

Conflicts:
	Hoverboard/Hoverboard.userprefs
gravity
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Assembly-UnityScript-Editor-vs.unityproj
	Hoverboard/Assembly-UnityScript-Editor.unityproj
	Hoverboard/Assembly-UnityScript-firstpass-vs.unityproj
	Hoverboard/Assembly-UnityScript-firstpass.unityproj
	Hoverboard/Assets/Prefabs/Hoverboard 3.0.prefab
	Hoverboard/Assets/Script/Hover_Physics.cs
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Hoverboard-csharp.sln
	Hoverboard/Hoverboard.sln
gravity
Merge stuff
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Library/InspectorExpandedItems.asset
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/guidmapper
	Hoverboard/ProjectSettings/InputManager.asset
Assembly wut
Installed latest update for fmod
trying to merge
Merge branch 'Robbin'

Conflicts:
	Hoverboard/Assets/Script/Movement.cs
Mer fysik
asd
Merge branch 'master' of https://github.com/Raful/Hoverboard

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
	Hoverboard/Library/InspectorExpandedItems.asset
	Hoverboard/Library/guidmapper
Removed ignored files
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Script/CameraMec.cs
	Hoverboard/Assets/Script/Movement.cs