Merge in editcheckbuttons
Merge pull request #71 from CAPS-Robotics/dev

Merge in editcheckbuttons