Trying to implement pump
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Assets/Prefabs/Character/Hoverboard 4.0.prefab
	Hoverboard/Assets/Prefabs/GUI/TimerText.prefab
	Hoverboard/Assets/Prefabs/Main Camera.prefab
	Hoverboard/Assets/Scenes/Scen_utan_mark.unity
	Hoverboard/Assets/Script/Character/DetectState/MoveKeyState.cs
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
	Hoverboard/Assets/Script/Medal.cs
HEJ
poke
We can change states again
Changes to jump and timer
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
Merge remote-tracking branch 'origin/wolfie' into Erik

Conflicts:
	Hoverboard/Assets/Script/Timer.cs
ResetTransform is back in action
TERMINAL VELOCITY
Maybe terminal velocity
Merge branch 'Erik'
Chechpoint speed reset
lördags arbete
Merge branch 'master' of https://github.com/Raful/Hoverboard into Andreas
2014-05-19   09:59