Commiting so I can pull

diff --cc src/org/usfirst/frc/team3501/robot/Constants.java
index 7164c7b996b0d839bf74339018f79f93d407177e,5d14ccd1b8d7d9d3be2f2c549eb76ce02bb2177c..97036b54f41ce14482e159032cbf6763966556c0
--- 1/src/org/usfirst/frc/team3501/robot/Constants.java
--- 2/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@@ -17,11 -13,7 +17,13 @@@ public class Constants 
      public final static int TOGGLE_WINCH_PORT = 0;
      public final static int TOGGLE_FLYWHEEL_PORT = 0;
      public final static int TOGGLE_INDEXWHEEL_PORT = 0;
 -      public static final int TOGGLE_CAMERA_FEEDS = 4;
 +
 +    public final static int TOGGLE_GEAR_PORT = 0;
 +
 +    public static final int TOGGLE_CAMERA_FEEDS = 7;
 +
++    public static final int TOGGLE_CAMERA_FEEDS = 4;
++
    }
  
    public static class Shooter {

diff --cc src/org/usfirst/frc/team3501/robot/OI.java
index a9948d7ae500cce9d4167a140ce592530b40c59e,77791cdd590c182e263a3459c04c31e7428cf2e7..87f069bdb8ce692ad33721fcbb7ed4d570bd3d89
--- 1/src/org/usfirst/frc/team3501/robot/OI.java
--- 2/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@@ -1,10 -1,6 +1,14 @@@
  package org.usfirst.frc.team3501.robot;
  
 +
++
 +import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
 +=======
 +import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
 +>>>>>>> added command for toggling camera feeds
++=======
+ import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
++>>>>>>> cb0f662264528bcb0d783fcb00db22eb8d4f4283
  
  import edu.wpi.first.wpilibj.Joystick;
  import edu.wpi.first.wpilibj.buttons.Button;
@@@ -18,11 -14,9 +22,13 @@@ public class OI 
  
    public static Button toggleIndexWheel;
    public static Button toggleFlyWheel;
 -  
 +
 +  public static Button toggleCameraFeeds;
 +
+   public static Button toggleCameraFeeds;
+ 
 +  public static Button toggleGear;
 +
    public OI() {
      leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
      rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
@@@ -32,16 -26,10 +38,23 @@@
          Constants.OI.TOGGLE_INDEXWHEEL_PORT);
      toggleFlyWheel = new JoystickButton(leftJoystick,
          Constants.OI.TOGGLE_FLYWHEEL_PORT);
 -    
 +
++
 +    toggleGear = new JoystickButton(leftJoystick,
 +        Constants.OI.TOGGLE_GEAR_PORT);
 +    toggleGear.whenPressed(new ToggleGear());
 +
 +
      toggleCameraFeeds = new JoystickButton(leftJoystick, Constants.OI.TOGGLE_CAMERA_FEEDS);
 -    
 +
      toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
 +
++
++
++    toggleCameraFeeds = new JoystickButton(leftJoystick, Constants.OI.TOGGLE_CAMERA_FEEDS);
++
++    toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
++
    }
  
    public static OI getOI() {

diff --cc src/org/usfirst/frc/team3501/robot/Robot.java
index c8ef56804895f761c144b995680e0d31968d2628,cfd9e38d1a5255a4881b23e1cce94715d9262de6..d4f5d946eb9e987828350b694c6b0f550f3d4174
--- 1/src/org/usfirst/frc/team3501/robot/Robot.java
--- 2/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@@ -40,8 -29,7 +40,11 @@@ public class Robot extends IterativeRob
      // CameraServer.getInstance().startAutomaticCapture();
      // cameraServer2 = CameraServer.getInstance();
      // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
++
 +    // cameraFeeds = new CameraFeeds();
 +
+     cameraFeeds = new CameraFeeds();
++
    }
  
    public static DriveTrain getDriveTrain() {
@@@ -75,9 -60,7 +78,11 @@@
  
    @Override
    public void teleopInit() {
 +
      cameraFeeds.init();
 +
++    cameraFeeds.init();
++
    }
  
    @Override