fixed
fixing teleop functions
Merge branch 'pokey600' of
https://github.com/irs1318dev/irs1318_2014fall into pokey600