okok
Merge branch 'master' of https://github.com/Pixelis/pixblog

Conflicts:

sites/default/files/styles/article-hp-tumb/public/GettyImages_88903868.j
pg

sites/default/files/styles/article-hp-tumb/public/balise_topbarman_0.jpg
	sites/default/files/styles/author-thumb/public/Eva-DUSSOUS-BD.jpg