commit ali
commit
commit al
commit
commit js
Merge branch 'master' of https://github.com/ptitbibice/ProjetGalerie

Conflicts:
	ProjetGalerie/css/styles.css
	ProjetGalerie/imageCategorie.php