Merge branch 'main' into 'develop'

# Conflicts: # Hello.py

Merge branch 'main' into 'develop'
69c73212 · Smith, Thomas E (PG/T - Comp Sci & Elec Eng) · 45c247d4 · 8f32a523 · 69c73212
Commit 69c73212 authored 4 months ago by Smith, Thomas E (PG/T - Comp Sci & Elec Eng)
--- a/Hello.py
+++ b/Hello.py
-print("Hello World, I am feeling Happy")
+<<<<<<< Hello.py
+
+=======
+print("Hello World, Thomas")
+print("I am feeling Happy")
+>>>>>>> Hello.py