Resolved conflicts
Merge branch 'FinalBotCode' of https://github.com/OHSBlazerbots/RobotCode2014.git
New Subsystems, Picker and Shooter. IN THEORY, the Picker should work. Shooter needs work because we will be using an Analog motor, and a lot of time was spent figuring out whether it'd be Digital or not.
Revert "Cleaned up OI + added to RobotMap"

This reverts commit 28f8e84f364e63efcbddb3b484db9759017bf57b.
Merge branch 'master' of https://github.com/OHSBlazerbots/RobotCode2014.git
Revert "New Subsystems, Picker and Shooter. IN THEORY, the Picker should work. Shooter needs work because we will be using an Analog motor, and a lot of time was spent figuring out whether it'd be Digital or not."

This reverts commit 7eae694d404f2df080e3645e27b3f61c90c05326.
Revert "Testing branches"

This reverts commit 8d17709dfd62e78373b0a9189da809c342cd8fcf.
Various changes from Feb 6th, 2013. Including not running into walls
Resolved conflicts
Merge origin/FinalBotCode into FinalBotCode
Autonomous, drive in square, picker toggling