Move calc files to a specific folder and add in PID control stuff
Merge branch 'master' of https://github.com/jtanx/GENG4402
Merge remote-tracking branch 'upstream/master'