Merge remote-tracking branch 'origin/master'

Author: lne03

src/main/java/com/nerdherd/lib/motor/motorcontrollers/CANMotorController.java

@@ -88,7 +88,10 @@ public default void configFollowers(CANMotorController[] followers) {
     }
 
     public abstract void configDeadband(double deadband);
-    
+
+    public abstract void configCurrentLimitPeak(double current);
+
+    public abstract void configCurrentLimitContinuous(double current);    
 
 
 }

src/main/java/com/nerdherd/lib/motor/motorcontrollers/NerdyFalcon.java

@@ -215,7 +215,7 @@ public double getVelocity() {
      * Only works with CTRE Motor Controllers
      */
     public void followCANMotorController(CANMotorController master) {
-        if (master instanceof NerdyTalon || master instanceof NerdyVictorSPX) {
+        if (master instanceof NerdyTalon || master instanceof NerdyVictorSPX || master instanceof NerdyFalcon) {
             super.follow( (IMotorController) master);
         }
 	}

src/main/java/com/nerdherd/lib/motor/motorcontrollers/NerdyVictorSPX.java

@@ -100,4 +100,16 @@ public void configDeadband(double deadband) {
        super.configNeutralDeadband(deadband);
 
     }
+
+    @Override
+    public void configCurrentLimitPeak(double current) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void configCurrentLimitContinuous(double current) {
+        // TODO Auto-generated method stub
+
+    }
 }

src/main/java/com/nerdherd/lib/motor/motorcontrollers/SmartCANMotorController.java

@@ -39,10 +39,6 @@ public interface SmartCANMotorController extends CANMotorController{
 
     public abstract void configMotionMagic(int accel, int vel);
 
-    public abstract void configCurrentLimitPeak(double current);
-
-    public abstract void configCurrentLimitContinuous(double current);
-
     public abstract void resetEncoder();
 
     public abstract double getPosition();