"Dizzy" after collision, seconds parameter ..
Merge branch 'master' into daniel

Conflicts:
	Assets/Scripts/playerCollision.cs
	Assets/Scripts/scr_movementLogic.cs
	ProjectSettings/EditorBuildSettings.asset
Pushing to my own branch ..
Fungerande collison, dock glitchad i vissa vinklar..
Merge branch 'master' into daniel

Conflicts:
	Assets/Scenes/test_robin.unity
	Assets/Scripts/MovementLogic.cs
	Assets/Scripts/playerCollision.cs
	ProjectSettings/EditorBuildSettings.asset
Merge branch 'master' of https://github.com/Omnes/Bananas

Conflicts:
	Assets/Scripts/MovementLogic.cs
corrected a wild merge conflict
and another missed one
Merge branch 'master' into johannes