fixed merge errors in branch

diff --cc src/org/usfirst/frc/team3501/robot/OI.java
index 92169fe89424c64724d283b165a8b8fc1e807ad5,ec405ac0aeca44daba0e501381b186e0ba476dbe..06bfc2db87db26a5a2facb01dd4982fea511f651
--- 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
@@@ -17,23 -10,14 +17,25 @@@ public class OI 
    private static OI oi;
    public static Joystick leftJoystick;
    public static Joystick rightJoystick;
 -  public static Button toggleWinch;
  
 +  public static Button toggleWinch;
    public static Button toggleIndexWheel;
    public static Button toggleFlyWheel;
 +  public static Button toggleIntake;
 +  public static Button toggleReverseIntake;
 +  public static Button toggleHighGear;
 +  public static Button toggleNormalGear;
 +  public static Button increaseShootSpeed;
 +  public static Button decreaseShootSpeed;
 +  public static Button turn90Right;
 +  public static Button turn90Left;
 +  public static Button readyShooter;
 +  public static Button shootButton;
  
+   public static Button toggleGear;
+ 
    public OI() {
 +    System.out.println("OI is open");
      leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
      rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
      toggleWinch = new JoystickButton(leftJoystick,