updating après fusion de branches

efface branche master
Merge branch 'pierreozoux-master' into gh-pages
Merge pull request #2 from ChristopheDucamp/gh-pages

merge