added contoller2 framework (untested)
Merge branch 'master' of https://github.com/MaciCrowell/compRoboFinalProject