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/project.greenfoot

@@ -8,9 +8,13 @@ class.Projectile.image=Projectile1.png
 class.StartWorld.image=StartBackground.png
 dependency1.from=GameOverWorld
 dependency1.to=Button
+dependency1.from=PlayerTestWorld
+dependency1.to=Ground
 dependency1.type=UsesDependency
 dependency2.from=StartWorld
 dependency2.to=Button
+dependency2.from=PlayerTestWorld
+dependency2.to=Player
 dependency2.type=UsesDependency
 dependency3.from=MyWorld
 dependency3.to=Player
@@ -37,6 +41,19 @@ editor.fx.0.y=65
 height=736
 package.numDependencies=8
 package.numTargets=7
+dependency3.from=MyWorld
+dependency3.to=Player
+dependency3.type=UsesDependency
+dependency4.from=Player
+dependency4.to=Ground
+dependency4.type=UsesDependency
+editor.fx.0.height=737
+editor.fx.0.width=814
+editor.fx.0.x=360
+editor.fx.0.y=26
+height=830
+package.numDependencies=4
+package.numTargets=4
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -67,6 +84,7 @@ target2.x=0
 target2.y=0
 target3.height=70
 target3.name=Button
+target3.name=PlayerTestWorld
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=120
@@ -100,8 +118,19 @@ target7.type=ClassTarget
 target7.width=120
 target7.x=0
 target7.y=0
+target4.height=70
+target4.name=MyWorld
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=120
+target4.x=0
+target4.y=0
 version=3.1.0
 width=856
 world.lastInstantiated=StartWorld
 xPosition=652
 yPosition=76
+width=1550
+world.lastInstantiated=PlayerTestWorld
+xPosition=0
+yPosition=0