Revert "Revert "Revert "COLISIONES"""

This reverts commit 5bb23da62155779bed25dfa8199daf50f2a5d285.
¡
Merge remote-tracking branch 'origin/master'

Conflicts:
	Marco gigi.gmx/Marco gigi.project.gmx