PA's contribution
Merge branch 'master' of https://github.com/FlorentinG/delaunay
Test conflict