Fixe isCollidedWith for Ship
Merge with gh-pages