Adds damping force when calculating force from Hookes Law, finishes the Tether update method
Fix merge.