Merge branch 'master' of

https://github.com/DeepBlueRobotics/RobotCode2018.git

Conflicts:
	Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java
	Robot2018/src/org/usfirst/frc/team199/Robot2018/autonomous/VelocityPIDController.java

hopefully this resolves the conflicts w/ Kate's merge :/

Author: lhmcgann

Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java

@@ -32,6 +32,11 @@
  * floating around.
  */
 public class RobotMap {
+
+	public static WPI_TalonSRX intakeMotor;
+	public static WPI_TalonSRX liftMotor;
+	public static WPI_TalonSRX climberMotor;
+
 	public static DigitalSource leftEncPort1;
 	public static DigitalSource leftEncPort2;
 	public static Encoder leftEncDist;
@@ -89,6 +94,13 @@ private void configSPX(WPI_VictorSPX mc) {
 
 	public RobotMap() {
 
+		intakeMotor = new WPI_TalonSRX(getPort("IntakeTalonSRX", 4));
+		configSRX(intakeMotor);
+		liftMotor = new WPI_TalonSRX(getPort("LiftTalonSRX", 5));
+		configSRX(liftMotor);
+		climberMotor = new WPI_TalonSRX(getPort("ClimberTalonSRX", 6));
+		configSRX(climberMotor);
+
 		leftEncPort1 = new DigitalInput(getPort("1LeftEnc", 0));
 		leftEncPort2 = new DigitalInput(getPort("2LeftEnc", 1));
 		leftEncDist = new Encoder(leftEncPort1, leftEncPort2);
@@ -153,4 +165,5 @@ public int getPort(String key, int def) {
 		}
 		return (int) SmartDashboard.getNumber("Port/" + key, def);
 	}
+
 }