add picker upper
Merge branch 'master' of https://github.com/hatsunearu/OneDegreeNorth-FRC-2014

Conflicts:
	SAS-Robot-14/src/edu/wpi/first/wpilibj/templates/RobotMap.java
	SAS-Robot-14/src/edu/wpi/first/wpilibj/templates/subsystems/Pickup.java
idk what I'm doing
LOTS OF RE CHANGES
Implemented trigger for pickker upper in