comment
Merge branch 'master' of https://github.com/PaulCaudron/PaulCaudron.github.io

Conflicts:
.gitignore
fixed?