?!?
Merge branch 'master' of https://github.com/Cindy-p/nicody_galerie

Conflicts:
	js/galerie.js