24-04-14 16:16
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas
25-04-14   10:22
morgonhämtning
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
29-04-2014   10:29
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas
valborg morgon
valborg kl 17:00
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Prefabs/Hoverboard 3.4.prefab
	Hoverboard/Assets/Script/'Levolution' events/Levitation.cs.meta
	Hoverboard/Assets/Script/CameraMec.cs
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
	Hoverboard/Assets/Script/Raycast.cs.meta
	Hoverboard/Assets/Script/RotateToGround.cs.meta
	Hoverboard/Assets/Script/Rotation.cs.meta
	Hoverboard/Assets/Textures/Character/Hoverboard.meta
	Hoverboard/Assets/Textures/Character/Hoverboard/Materials.meta
2 maj 11:40
2 maj 11::43
gs
2 maj 2014 16:39
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

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

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

Conflicts:
	Hoverboard/Assets/Prefabs/Hoverboard 3.4.prefab
	Hoverboard/Assets/Script/Character/DetectState/GrindKeyState.cs
06-05-2014  15:17
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas

Conflicts:
	Hoverboard/Assets/Prefabs/Character/Hoverboard 4.0.prefab
	Hoverboard/Assets/Script/Character/DetectState/GrindKeyState.cs
	Hoverboard/Assets/Script/Character/DetectState/MoveKeyState.cs
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs