pre merge
Merge branch 'master' of https://github.com/Raful/Hoverboard into iteration3

Conflicts:
	Hoverboard/Assets/Script/Character/DetectState/GrindKeyState.cs
building prefabs
buildings PREFAB DISASTER!
fix rails + new buildings
end of the day
Merge branch 'iteration3' of https://github.com/Raful/Hoverboard into iteration3
end of day
Merge branch 'master' of https://github.com/Raful/Hoverboard into iteration3

Conflicts:
	Hoverboard/Assets/Scenes/grindtest.unity
	Hoverboard/Assets/Script/Character/DetectState/GrindKeyState.cs
Merge branch 'iteration3' of https://github.com/Raful/Hoverboard into iteration3
Material yay
nånting
Merge branch 'iteration3' of https://github.com/Raful/Hoverboard into iteration3

Conflicts:
	Hoverboard/ProjectSettings/EditorBuildSettings.asset
End of day
Checkpoint
checkpoints in the level, updated input
Merge branch 'master' of https://github.com/Raful/Hoverboard into iteration3

Conflicts:
	Hoverboard/Assets/Scenes/Scen_utan_mark.unity
	Hoverboard/Assets/Script/Character/DetectState/MoveKeyState.cs
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
	Hoverboard/ProjectSettings/EditorBuildSettings.asset
	Hoverboard/ProjectSettings/InputManager.asset
Merge branch 'Robbin' of https://github.com/Raful/Hoverboard into iteration3

Conflicts:
	Hoverboard/Assets/Script/Character/DetectState/AirKeyState.cs
	Hoverboard/Assets/Script/Character/DetectState/MoveKeyState.cs
	Hoverboard/Assets/Script/Character/HoverBoard/Movement.cs
	Hoverboard/ProjectSettings/EditorBuildSettings.asset
pre-merge
Merge branch 'master' of https://github.com/Raful/Hoverboard into iteration3