Merge branch 'main' into week-2-comp-locked

diff --cc src/main/java/frc/robot/RobotContainer.java
index df84e51df4b9bb7aa2399561fcaaa04a134fa63f,fe64006ac8a073db57615b136e6f5a1cc302f3eb..6b6dc4a4177743d74eb0a226ea188c00ec7a7011
--- 1/src/main/java/frc/robot/RobotContainer.java
--- 2/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@@ -216,19 -212,8 +212,8 @@@ public class RobotContainer 
        }));
      }
  
-     // if (intake != null && spindexer != null){
-     // NamedCommands.registerCommand("Spin Intake Rollers", new
-     // ParallelCommandGroup(
-     // new InstantCommand(()->intake.spin(IntakeConstants.SPEED))
-     // ));
-     // NamedCommands.registerCommand("Stop Intake Rollers", new
-     // ParallelCommandGroup(
-     // new InstantCommand(()->intake.spinStop())
-     // ));
-     // }
- 
      if (turret != null && drive != null && hood != null && shooter != null && spindexer != null) {
 -      Command runSpindexer = new RunSpindexer(spindexer, turret);
 +      Command runSpindexer = new RunSpindexer(spindexer, turret, hood);
        NamedCommands.registerCommand("Auto shoot", new AutoShootCommand(turret, drive, hood, shooter, spindexer));
        NamedCommands.registerCommand("Start Spindexer",
            new InstantCommand(() -> CommandScheduler.getInstance().schedule(runSpindexer)));