Har gjort färdigt mycket av menyn.
Lite mer GUI

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

Conflicts:
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Assets/testscenepleaseignore.unity
	Hoverboard/Hoverboard.userprefs
	Hoverboard/Library/AssetServerCacheV3
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/InspectorExpandedItems.asset
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/ScriptMapper
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/expandedItems
	Hoverboard/Library/guidmapper
	Hoverboard/Library/metadata/00/00000000000000002000000000000000
	Hoverboard/Library/metadata/00/00000000000000003000000000000000
	Hoverboard/Library/metadata/00/00000000000000004000000000000000
	Hoverboard/Library/metadata/00/00000000000000004100000000000000
	Hoverboard/Library/metadata/00/00000000000000005000000000000000
	Hoverboard/Library/metadata/00/00000000000000005100000000000000
	Hoverboard/Library/metadata/00/00000000000000006000000000000000
	Hoverboard/Library/metadata/00/00000000000000006100000000000000
	Hoverboard/Library/metadata/00/00000000000000007000000000000000
	Hoverboard/Library/metadata/00/00000000000000008000000000000000
	Hoverboard/Library/metadata/00/00000000000000009000000000000000
	Hoverboard/Library/metadata/00/0000000000000000a000000000000000
	Hoverboard/Library/metadata/00/0000000000000000b000000000000000
	Hoverboard/Library/metadata/00/0000000000000000c000000000000000
	Hoverboard/Library/metadata/dc/dc5a88ed812499d4d922800eb1243dbf
Tror inte allt blev sparat innan jag commita förra gången.
tjohej, menyn har lite ljudinställningar..
Ljudinställningar och sånt, tjohoo
.gitignore
Merge
Merge branch 'master' of https://github.com/Raful/Hoverboard into Pontus

Conflicts:
	Hoverboard/Assembly-UnityScript-vs.unityproj
	Hoverboard/Assembly-UnityScript.unityproj
	Hoverboard/Hoverboard.userprefs
	Hoverboard/Library/InspectorExpandedItems.asset
	Hoverboard/Library/ProjectSettings.asset
	Hoverboard/ProjectSettings/EditorBuildSettings.asset
14-04-14   15:58
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Hoverboard.userprefs
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/InspectorExpandedItems.asset
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/guidmapper
Kontroll för att se till att projektet är intakt
Merge branch 'Pontus' of https://github.com/Raful/Hoverboard into Pontus

Conflicts:
	Hoverboard/Assembly-CSharp.csproj
	Hoverboard/Assembly-UnityScript-vs.unityproj~HEAD
	Hoverboard/Assets/Script/Meny.cs
	Hoverboard/Hoverboard.userprefs
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/InspectorExpandedItems.asset
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/expandedItems
	Hoverboard/Library/guidmapper
Rensat av Spjuth för att förbereda merge till iteration1 branch
uppdaterat branchen
Merge branch 'Pontus' of https://github.com/Raful/Hoverboard into Pontus

Conflicts:
	Hoverboard/Assembly-CSharp.csproj
	Hoverboard/Library/InspectorExpandedItems.asset
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/guidmapper
Försöker commita en grej. Erik sa att han inte hade tillgång till mina scener
15-04-14  16:20
asd
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

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

Conflicts:
	Hoverboard/Assembly-UnityScript-Editor-vs.unityproj
	Hoverboard/Assembly-UnityScript-Editor.unityproj
	Hoverboard/Assets/Script/Hover_Physics.cs
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Hoverboard.userprefs