I don't know
Merge branch 'master' of https://github.com/Kureb/Blog

Conflicts:
	Affichage.php
	Banniere_Article.jpg