Working on Climb Logic
Merge master into climb-development
Working on Climb Logic, committed before lunch.
Working on Climb Logic, committed before lunch.
Working on Climb Logic.
Merge master into climb-development
Merge origin/master into climb-development
Implemented isDone() in ClimbTask
Merge origin/master into climb-development
Merge origin/master

Conflicts:
	AdamBots-FIRST-2013-Robot-Code/src/robot/sensors/RobotSensors.java
Merge branch 'master' of https://github.com/benrbray/AdamBots-FIRST-2013-Robot-Code
Merge branch 'master-development' of https://github.com/benrbray/AdamBots-FIRST-2013-Robot-Code.git
Merge master into climb-development
Fixed sensor references.
Merge branch 'master' of https://github.com/benrbray/AdamBots-FIRST-2013-Robot-Code.git into teleop-testing
Updated motor to a Talon to match IO sheet, changed TODO comment. Nathan needs to add a constant shooter speed method for when TargetLogic is not Targeting.
Shooter will now spin at the value of MagicBox.getShooterManualSpeed() when the right bumper is not being held on the secondary xbox controller.
generated javadoc
Commented FancyJoystick
Fixed RobotMain comment references.