Changed the controller number on the intake wheels.
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp
Made some port alters to the Robotmap. The gyro changed from port 4 to 2 so it can have the accumulator on it, a gyro_temp port was made for the temperature sensing part of the gyro and the distance sensor was changed to port 4.
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp