Merge branch 'main' into elastic

diff --cc src/main/java/frc/robot/RobotContainer.java
index 50743b448145a330c7870eece98fb7a30da62ae5,fe64006ac8a073db57615b136e6f5a1cc302f3eb..230da81a235ea9979b7bc99537653e7ac294980d
--- 1/src/main/java/frc/robot/RobotContainer.java
--- 2/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@@ -87,10 -86,7 +86,9 @@@ public class RobotContainer 
      // display the current robot id on smartdashboard
      SmartDashboard.putString("RobotID", robotId.toString());
  
 +    SmartDashboard.putNumber("Match Time", 0.0);
 +
      // Filling the SendableChooser on SmartDashboard
-     // autoChooserInit();
  
      // dispatch on the robot
      switch (robotId) {