Merged with Master.
Updated MagicBox logic. Updated MagicBox usage in TeleopLogic. Updated Winch control in TeleopLogic. Implemented finish() in TeleopLogic.
Updated MagicBox Logic.
Merge branch 'master' of https://github.com/benrbray/AdamBots-FIRST-2013-Robot-Code.git into teleop-development
Merge branch 'master' of https://github.com/benrbray/AdamBots-FIRST-2013-Robot-Code.git into teleop-development
Updated logic relating to RobotPickup, intake roller for main driver and elevator for secondary driver.
Merge origin/teleop-development into climb-development
Renamed init() to initPhase(), update() to updatePhase(), etc. to make purpose more clear.
Cleaned up LogicPhase and made methods more clear
Merge origin/master into climb-development