merging
Merge branch 'main' of https://github.com/Nashoba-Robotics/Nashoba-Robotics2013J into main
Changed variable names to sane ones