commit mic
Merge branch 'master' of https://github.com/ptitbibice/ProjetGalerie

Conflicts:
	ProjetGalerie/categorie/coquelicot/coquelicot.txt
	ProjetGalerie/imageCategorie.php