Merge branch 'develop' into 'main'

added how i am feeling See merge request !1

Merge branch 'develop' into 'main'
3ebb98bd · Nallani, Abhishikth (UG - Comp Sci & Elec Eng) · 283958e8 · 7c8ff86a · 3ebb98bd
Commit 3ebb98bd authored 5 months ago by Nallani, Abhishikth (UG - Comp Sci & Elec Eng)
--- a/hello.py
+++ b/hello.py
+<<<<<<< hello.py
 print("Hello World, Abhi")
-
+print("I am feeling happy today")
+>>>>>>> hello.py