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

Conflicts:
	Hoverboard/Hoverboard.userprefs
	Hoverboard/Library/CurrentLayout.dwlt
Made some changes in Timer and made finish able to load lvls on a time differense
annandagpåsk
medal and buttonOptions
added some graphics to test + worked on high score
Merge branch 'master' of https://github.com/Raful/Hoverboard into Robbin
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' into Robbin

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
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
	Hoverboard/Library/guidmapper
Implemented high score
mer fysik...
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas
asd
Collider
Merge branch 'master' of https://github.com/Raful/Hoverboard into Robbin

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
Removed ignored files + some fixes
Merge branch 'master' of https://github.com/Raful/Hoverboard into Robbin