Merge branch 'main' of https://github.com/s-france/GGJ2024GoombaGame

# Conflicts:
#	GoombaGame/scene2D.tscn
