Fix the pickup solenoids to work with the system
Merge branch 'master' of https://github.com/HVA-FRC-3824/HVA_Robot_2013

Conflicts:
	Commands/SetShooterAngle.cpp
	Robot.cpp
	Subsystems/Pickup.cpp
	Subsystems/Pickup.h