merged over best copies from SVn of code for robot years
Merge branch 'master' of https://github.com/discobots2587/disco-frc