Added Servos for ShooterSubsystem.
Merge origin/ShooterBranch into ShooterBranch; added Servos for catapult.

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotMap.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/ShooterSubsystem.java