Merge branch 'develop' into 'main'

# Conflicts:
#   Hello.py

Hello.py

+<<<<<<< Hello.py
 print("Hello World") 
 print("I am feeling happy today")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+print("Hello World, Miri")
+>>>>>>> Hello.py