Merge branch 'main' into 'develop'

# Conflicts: # hello.py

Merge branch 'main' into 'develop'
16d012b7 · Newton, Matt D (UG - Comp Sci & Elec Eng) · 54f73639 · 445c0a44 · 16d012b7
Commit 16d012b7 authored 1 year ago by Newton, Matt D (UG - Comp Sci & Elec Eng)
--- a/hello.py
+++ b/hello.py
-print("Hello World")
+print("Hello World, Matt")
 print("I am feeling happy today")
\ No newline at end of file