suppression de la deuxieme proposition
Merge branch 'master' into gh-pages