Merge remote-tracking branch 'origin/main'

# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/Player.class
#	SMIMS-Game/Player.ctxt
#	SMIMS-Game/project.greenfoot

SMIMS-Game/Player.ctxt

@@ -11,4 +11,14 @@ comment4.params=
 comment4.target=void\ fall()
 comment5.params=
 comment5.target=boolean\ collision()
+comment6.params=
+comment6.target=void\ handlePowerUps()
+comment7.params=duration\ type
+comment7.target=void\ reveivePowerUp(int,\ java.lang.String)
+numComments=8
+comment3.target=void\ jump()
+comment4.params=
+comment4.target=void\ fall()
+comment5.params=
+comment5.target=boolean\ collision()
 numComments=6