17-04-14   14:30
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Hoverboard.userprefs
	Hoverboard/Library/CurrentLayout.dwlt
annandagpåsk
medal and buttonOptions
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Library/InspectorExpandedItems.asset
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/guidmapper
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Script/CameraMec.cs
	Hoverboard/Assets/Script/Movement.cs
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

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

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
	Hoverboard/Library/guidmapper
24-04-14 13:05
Removed ignored files
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

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

Conflicts:
	Hoverboard/Assets/Script/CameraMec.cs
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
	Hoverboard/Assets/Script/Finish.cs
	Hoverboard/Assets/Script/Misc/KeyPair.cs
	Hoverboard/Assets/Script/Timer.cs
asd
Merge branch 'Niklas'
15:04
Merge branch 'Andreas'
Merge branch 'master' of https://github.com/Raful/Hoverboard into Robbin
fixed a prefab
inget
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Hoverboard-csharp.sln
	Hoverboard/Hoverboard.sln