merge
Merge branch 'master' of https://github.com/paulmakl/Capstone
added some comments
fixed bug in updateGrideForces