MainRobot

set code for pickup testing
Merge branch 'master' of https://github.com/Nathan-Fenner/AdamBots-2014-FRC-Programming

Conflicts:
	FRC-2014/src/edu/wpi/first/wpilibj/templates/MainRobot.java