Merge branch 'main' into 'develop'

# Conflicts: # hello.py

Merge branch 'main' into 'develop'
6cca8480 · Young, Will W (PG/T - Comp Sci & Elec Eng) · af07339f · 9fb3b124 · 6cca8480
Commit 6cca8480 authored 5 months ago by Young, Will W (PG/T - Comp Sci & Elec Eng)
--- a/hello.py
+++ b/hello.py
-print('hey there guys, its jeff')
+<<<<<<< hello.py
+print('hey there guys, its jeff, im scared of you')
+
+>>>>>>> hello.py