Minor changes to my own scene
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

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

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

Conflicts:
	Hoverboard/Hoverboard-csharp.sln
	Hoverboard/Hoverboard.sln
Copied elements from the hoverboard to the "real" character
HoverBoard Physics
Fixed some stuff
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik
mETA fileS
Merge remote-tracking branch 'origin/Niklas'

Conflicts:
	Hoverboard/Assets/Materials/Green.mat
	Hoverboard/Assets/Prefabs/Hoverboard 2.0.prefab
	Hoverboard/Assets/Script/Movement.cs
	Hoverboard/Hoverboard-csharp.sln
	Hoverboard/Hoverboard.sln
	Hoverboard/Hoverboard.userprefs
Missed one.