Gestion collision
Merge branch 'master' of https://github.com/joakim-d/ropeboy