fixed merge conflict in Robot.java

diff --combined src/org/usfirst/frc/team3501/robot/Robot.java
index 8fd099fb2999081e999638cb08d2e46b9872297f,99f66213b193728ddf53e4f1927785d979df62e9..80d786762994a72067d56a36d2d4c8ce7d1cb29e
--- 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
@@@ -1,14 -1,13 +1,12 @@@
  package org.usfirst.frc.team3501.robot;
  
  import org.usfirst.frc.team3501.robot.Constants.Defense;
- import org.usfirst.frc.team3501.robot.sensors.GyroLib;
 -import org.usfirst.frc.team3501.robot.sensors.Photogate;
  import org.usfirst.frc.team3501.robot.subsystems.DefenseArm;
  import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
  import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
  import org.usfirst.frc.team3501.robot.subsystems.Scaler;
  import org.usfirst.frc.team3501.robot.subsystems.Shooter;
  
- import edu.wpi.first.wpilibj.I2C;
  import edu.wpi.first.wpilibj.IterativeRobot;
  import edu.wpi.first.wpilibj.command.Scheduler;
  import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
@@@ -24,19 -23,17 +22,15 @@@ public class Robot extends IterativeRob
    public static IntakeArm intakeArm;
    public static DefenseArm defenseArm;
  
 -  public static Photogate photogate;
 -
    // Sendable Choosers send a drop down menu to the Smart Dashboard.
    SendableChooser positionChooser;
    SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
 -  positionFourDefense, positionFiveDefense;
 +      positionFourDefense, positionFiveDefense;
  
-   // Gyro stuff
-   public GyroLib gyro;
- 
    @Override
    public void robotInit() {
      driveTrain = new DriveTrain();
      oi = new OI();
-     gyro = new GyroLib(I2C.Port.kOnboard, false);
  
      shooter = new Shooter();
      scaler = new Scaler();
@@@ -135,17 -132,11 +129,11 @@@
  
    @Override
    public void teleopInit() {
- 
-     gyro.start();
- 
    }
  
    @Override
    public void teleopPeriodic() {
      Scheduler.getInstance().run();
- 
-     System.out.println("Degrees: " + gyro.getRotationZ().getAngle());
- 
    }
  
  }

diff --combined src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 60452a0c9080bfe4bf61beb2c129ce0be2b37717,3633c04ca10e2fea9e5c63a656427a86642eaea1..0d9187a441b6a734e4fc0e61ef3d848a7034d16f
--- 1/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
--- 2/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@@ -2,7 -2,6 +2,7 @@@ package org.usfirst.frc.team3501.robot.
  
  import org.usfirst.frc.team3501.robot.Constants;
  import org.usfirst.frc.team3501.robot.sensors.Lidar;
 +import org.usfirst.frc.team3501.robot.sensors.Photogate;
  
  import edu.wpi.first.wpilibj.CANTalon;
  import edu.wpi.first.wpilibj.CounterBase.EncodingType;
@@@ -22,15 -21,16 +22,17 @@@ import edu.wpi.first.wpilibj.command.Su
  
  public class Shooter extends Subsystem {
    private CANTalon shooter;
-   private CANTalon angleAdjuster;
-   private DoubleSolenoid hood, punch;
+   private DoubleSolenoid hood1, hood2, punch;
    private Encoder encoder;
    private Lidar lidar;
 +  private Photogate photogate;
  
    public Shooter() {
      shooter = new CANTalon(Constants.Shooter.PORT);
-     angleAdjuster = new CANTalon(Constants.Shooter.ANGLE_ADJUSTER_PORT);
+     hood1 = new DoubleSolenoid(Constants.Shooter.HOOD_FORWARD,
+         Constants.Shooter.HOOD_REVERSE);
+     hood2 = new DoubleSolenoid(Constants.Shooter.HOOD_FORWARD,
+         Constants.Shooter.HOOD_REVERSE);
      punch = new DoubleSolenoid(Constants.Shooter.PUNCH_FORWARD,
          Constants.Shooter.PUNCH_REVERSE);
  
@@@ -47,7 -47,7 +49,7 @@@
     */
  
    public boolean isBallInside() {
 -    return true;
 +    return photogate.isBallPresent();
    }
  
    public void setSpeed(double speed) {
@@@ -94,6 -94,23 +96,23 @@@
      punch.set(Constants.Shooter.retract);
    }
  
+   public void raiseHood() {
+     hood1.set(Constants.Shooter.open);
+     hood2.set(Constants.Shooter.open);
+   }
+ 
+   public void lowerHood() {
+     hood1.set(Constants.Shooter.closed);
+     hood2.set(Constants.Shooter.closed);
+   }
+ 
+   public boolean isHoodDown() {
+     if (hood1.get() == Constants.Shooter.open
+         && hood2.get() == Constants.Shooter.open)
+       return true;
+     return false;
+   }
+ 
    @Override
    protected void initDefaultCommand() {
    }