Adding Colin's code
Merge branch 'master' of https://github.com/Nashoba-Robotics/Nashoba-Robotics2013J