Merge pull request #57 from CAPS-Robotics/dev

Push dev to master