RobotPickUp

fixed errors
Merge branch 'master' of https://github.com/Nathan-Fenner/AdamBots-2014-FRC-Programming