Modification des collisions
Merge branch 'master' of https://github.com/Natsirtt/bugfree-happiness
Debug des collisions => plus de plantage (marche toujours pas)