Merge branch 'main' into week-0-comp

diff --cc src/main/java/frc/robot/RobotContainer.java
index 4595abc0e6466a38fba5709f4585c780eda12cc5,bbe567dea42f8b86cec59921941aa3f8accc0021..37ce6e32df76364fbfcdddd17886f35ea3717aeb
--- 1/src/main/java/frc/robot/RobotContainer.java
--- 2/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@@ -37,11 -29,10 +37,11 @@@ import frc.robot.subsystems.Climb.Linea
  import frc.robot.subsystems.Intake.Intake;
  import frc.robot.subsystems.drivetrain.Drivetrain;
  import frc.robot.subsystems.drivetrain.GyroIOPigeon2;
+ import frc.robot.subsystems.hood.Hood;
  import frc.robot.subsystems.shooter.Shooter;
  import frc.robot.subsystems.spindexer.Spindexer;
 +import frc.robot.subsystems.spindexer.SpindexerConstants;
  import frc.robot.subsystems.turret.Turret;
- import frc.robot.subsystems.hood.Hood;
  import frc.robot.util.PathGroupLoader;
  import frc.robot.util.Vision.DetectedObject;
  import frc.robot.util.Vision.Vision;

diff --cc src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
Simple merge