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
Merge branch 'JavarioPlatform'

* JavarioPlatform:
  Fixed ports for analog in.
  Commented out PID so it doesn't cause problems on Saturday (just in case).
  Added Gyro Reset to Sensors.cpp, probably useful for Autonomous.
  Added Gyroscope code for driving straight in autonomous, plus a PIDSubsystem that definitely probable maybe works (or at least doesn't crash the robot)
  Tweaks to PID
  Deleted useless sample text document
  Mostly fixed PID program, may or may not do anything.
  sync with master, preparing for PID
fixed commenting errors in last merge
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp