Small changes
Merge branch 'master' into daniel
new better(more or less finished) collision.
Merge branch 'daniel' of https://github.com/Omnes/Bananas into daniel

Conflicts:
	Assets/Scenes/test_danielNew.unity
	Assets/Scripts/LeafManager.cs
	Assets/Scripts/MovementLogic.cs
	Assets/Scripts/playerCollision.cs
	ProjectSettings/EditorBuildSettings.asset
Merge branch 'master' into daniel

Conflicts:
	Assets/Scripts/MovementLogic.cs
	Assets/Scripts/playerCollision.cs
Merge branch 'master' into sean