Merge branch 'develop' into 'main'

yummy See merge request !7

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