Functional max and min on pickup arm
Merge branch 'PickupSubsystem'

Conflicts:
	MasterRobot/nbproject/project.bak.xml
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotMap.java