changes from unity
changed to fixedupdate
Merge branch 'master' of https://github.com/SaFrMo/gardens

Conflicts:
	Assets/scripts/movement/Swinging.cs
removing merge artifacts
Tether system basics
Removed grounded controls from tethered state, resulting in more realistic behavior
testing ropelength
unity did this
Merge branch 'sander' into ement

Conflicts:
	gardens-csharp.sln
	gardens.sln
Merge branch 'master' into ement - updating jumping and rope length code

Conflicts:
	Assets/scenes/building_template.unity
	Assets/scripts/movement/Swinging.cs
	Assets/scripts/movement/WASDMovement.cs
fixing merge so swinging gravity works properly
updaing prefabs, adding colliders to guides so player can't leave the level
updating collision with ground to use 2D collisions instead of 3D, jumping is working now
updating prefab so anchor points no longer collide with player
updating colliders on planters so player slides off the sides instead of sticking to them
updating scene layout
updating camera to follow player along both X and Y axes to facilitate horizontal as well as vertical play
Fixing movement type detection and jump input handling to properly attach & detach from anchors and be able to jump afterwards
Updating scene & prefabs with better collision detection and physics materials to keep player from getting stuck to the sides of platforms, etc
adding new physics materials to keep player from getting stuck