Merge to main for Scrimmage

Reviewed-on: #1

README.md

@@ -14,7 +14,11 @@ This repository contains the Pybricks code for Team 65266 Lego Dynamics' robot f
 
 ## Code Structure
 
+<<<<<<< HEAD
+Files are the different runs we do, with each run consisting of one or multiple mission completions. Another script combines these files into a "master" file, which then adds the color sensor to start logic.
+=======
 Files are the different runs we do, with each run consisting of one or multiple mission completions. Another script combines these files into a "master" file, which then adds the color-sensor-to-start logic.
+>>>>>>> dev
 
 ## How to Use
 
@@ -22,7 +26,11 @@ Load the master file into PyBricks, then send it over to the robot. Then you hol
 
 ## License
 GNU General Public License
+<<<<<<< HEAD
+You can take inspiration from our code, but you can't take our exact code.
+=======
 
 You can take inspiration from our code, but you can't take our exact code.
 
-Read LICENSE for more information.
+Read LICENSE for more information.
+>>>>>>> dev