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

Conflicts:
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/guidmapper
hej
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/expandedItems
	Hoverboard/Library/guidmapper
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/expandedItems
	Hoverboard/Library/guidmapper
2014-04-03 kl: 16:45
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Assets/Script/Rotation.cs
	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/00000000000000005100000000000000
	Hoverboard/Library/metadata/01/0167425d55c90d04a832bf79b5fba101
	Hoverboard/Library/metadata/32/3290d16ce4396cf4bb6e96e7dac78611
	Hoverboard/Library/metadata/61/616f7ba25ebbf1942a9ce8417eaa77c1
	Hoverboard/Library/metadata/61/61ae53c5971873f42ac27d295324b284
	Hoverboard/Library/metadata/a9/a96b6683dbe335344881f9362f0e3d00
	Hoverboard/Library/metadata/b1/b190f631b74602e4fa7cf81b22cf6a51
	Hoverboard/Library/metadata/ba/ba1d00cb83a1a8843829b33d3f4bca36
	Hoverboard/Library/metadata/d1/d1290940fdb189a43a434466875a750b
	Hoverboard/Library/metadata/d6/d65c6b90c829cd34bbb40dbff85f9bf4
	Hoverboard/Library/metadata/dc/dc5a88ed812499d4d922800eb1243dbf
	Hoverboard/Library/metadata/e6/e61ebe15a1dbc2540894bdf7b07fd7c3
2014-04-04 kl 15:53
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Script/Movement.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/guidmapper
	Hoverboard/Library/metadata/dc/dc5a88ed812499d4d922800eb1243dbf
hejhopp
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Hoverboard.userprefs
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/guidmapper
	Hoverboard/Library/metadata/dc/dc5a88ed812499d4d922800eb1243dbf
16:07
16:10
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assembly-CSharp-vs.csproj
	Hoverboard/Assembly-CSharp.csproj
	Hoverboard/Assets/Prefabs/Finish.prefab.meta
	Hoverboard/Assets/Prefabs/StartPoint.prefab.meta
	Hoverboard/Assets/Scenes/Erik.unity.meta
	Hoverboard/Assets/Scenes/Robbin.unity.meta
	Hoverboard/Assets/Script/Finish.cs.meta
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Assets/Script/Raycast.cs.meta
	Hoverboard/Assets/Script/RotateOnRay.cs.meta
	Hoverboard/Assets/Script/RotateToGround.cs.meta
	Hoverboard/Assets/Script/Rotation.cs.meta
	Hoverboard/Assets/Script/SpawnPosition.cs.meta
	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
	Hoverboard/Library/metadata/dc/dc5a88ed812499d4d922800eb1243dbf
17:15
9:45 2014-04-8
10:12 2014-04-08
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Hoverboard.userprefs
2014-04-08 16:04
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

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
	Hoverboard/Library/guidmapper