Merging JavarioTask1 with Master to add the Correct SmartDashboard code. failed initially due to merging conflicts.
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp

Conflicts:
	NewRobot/CommandBase.cpp
	NewRobot/CommandBase.h
Fixed merging (so Linda could pull master successfully, no actual changes)
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp
Added SmartDashboard for Intake and Platform.
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp into JavarioPlatform
sync with master, preparing for PID
Mostly fixed PID program, may or may not do anything.
Deleted useless sample text document
Tweaks to PID
Added Gyroscope code for driving straight in autonomous, plus a PIDSubsystem that definitely probable maybe works (or at least doesn't crash the robot)
Added Gyro Reset to Sensors.cpp, probably useful for Autonomous.
Commented out PID so it doesn't cause problems on Saturday (just in case).
Fixed ports for analog in.
demo changes
created PIDsubsystem for real PID
Merge remote-tracking branch 'remotes/origin/JavarioPlatform'
added Autonomous