småfix
Merge branch 'iteration3' of https://github.com/Raful/Hoverboard into iteration3
Uppdateringar
Merge branch 'iteration3' of https://github.com/Raful/Hoverboard into iteration3

Conflicts:
	Hoverboard/Assets/Editor/Image Effects/AntialiasingAsPostEffectEditor.js.meta
	Hoverboard/Assets/Imported objects (don't use)/OldStuff/Materials/20140208111510_53195.mat
	Hoverboard/Assets/Imported objects (don't use)/OldStuff/Materials/20140208111510_53195.mat.meta
	Hoverboard/Assets/Imported objects (don't use)/OldStuff/Materials/lambert1.mat.meta
	Hoverboard/Assets/Imported objects (don't use)/OldStuff/Materials/lambert5.mat
	Hoverboard/Assets/Imported objects (don't use)/OldStuff/Materials/lambert5.mat.meta
	Hoverboard/Assets/Materials.meta
	Hoverboard/Assets/Prefabs/Character/Materials.meta
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Bump/Build01_Bump_6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Bump/Build01_Bump_Comp.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Bump/Build01_Wide_Bump_Comp.prefab.meta
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Bump/Build01_Wide_Bump_Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Bump/Build01_Wide_Bump_Floors.prefab.meta
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Corkscrew/Build01_Corkscrew_6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Corkscrew/Build01_Corkscrew_Comp.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Corkscrew/Build01_Wide_Cork_CompV1.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Corkscrew/Build01_Wide_Cork_CompV1.prefab.meta
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Corkscrew/Build01_Wide_Cork_CompV2.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Corkscrew/Build01_Wide_Cork_CompV2.prefab.meta
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Corkscrew/Build01_Wide_Cork_Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Corkscrew/Build01_Wide_Cork_Floors.prefab.meta
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_FlatTop/Build01_FlatTop_6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_FlatTop/Build01_FlatTop_Comp.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_FlatTop/Build01_FlatTop_Roof.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_STH/Build01_STH_6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_STH/Build01_STH_6FloorsPT01.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_STH/Build01_STH_6FloorsPT02.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_STH/Build01_STH_Comp.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_STH/Build01_STH_Slope.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_TheGuitar/Build01_TheGuitar_6FloorsPT01.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_TheGuitar/Build01_TheGuitar_6FloorsPT02.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_TheGuitar/Build01_TheGuitar_Comp.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_TheGuitar/Build01_TheGuitar_RoofPT01.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_TheGuitar/Build01_TheGuitar_RoofPT02.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Tri/Build03_Tri01_Nowin.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Tri/Build03_Tri02_Roof.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Tri/Build03_Tri03_Win.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Triface/Build01_Triface_6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_Triface/Build01_Triface_Comp.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_V1/Build02_V1_Bot6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_V1/Build02_V1_Comp.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_V1/Build02_V1_Mid6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_V2/Build02_V2_HPBot6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_V2/Build02_V2_HPMid6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_V2/Build02_V2_HPTop.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_V2/Build02_V2_LPBot6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_V2/Build02_V2_LPMid6Floors.prefab
	Hoverboard/Assets/Prefabs/Obstacles/Buildings/_V2/Build02_V2_LPTop.prefab