fixing michael's stupidty
Merge branch 'master' of https://github.com/erhs-robotics/Robo2013