Merge branch 'main' into end_of_week_two_comp_branch

author Timofei <108955303+iefomit@users.noreply.github.com>

Mon, 16 Mar 2026 22:43:24 +0000 (15:43 -0700)

committer GitHub <noreply@github.com>

Mon, 16 Mar 2026 22:43:24 +0000 (15:43 -0700)
author Timofei <108955303+iefomit@users.noreply.github.com>
Mon, 16 Mar 2026 22:43:24 +0000 (15:43 -0700)
committer GitHub <noreply@github.com>
Mon, 16 Mar 2026 22:43:24 +0000 (15:43 -0700)
diff --cc src/main/java/frc/robot/RobotContainer.java
Simple merge
diff --cc src/main/java/frc/robot/subsystems/turret/Turret.java
Simple merge
author	Timofei <108955303+iefomit@users.noreply.github.com>
	Mon, 16 Mar 2026 22:43:24 +0000 (15:43 -0700)
committer	GitHub <noreply@github.com>
	Mon, 16 Mar 2026 22:43:24 +0000 (15:43 -0700)
		1	2
src/main/java/frc/robot/RobotContainer.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/frc/robot/subsystems/turret/Turret.java	patch \|	diff1 \|	diff2 \|	blob \| history