Friction is working
Callibrated some magic numbers, runs nice
Fixed for merge conflict
Merge pull request #19 from tpott/feature/friction

Feature/friction