fake project en dev
Merge branch 'master' of https://github.com/keltroth/galerie

Conflicts:
	cache/6cc797037f8b7dbf4c89ef58225e5435cache
	cache/cc2cb36aa6cd31e2c723826fd2825c41cache
	cache/d41d8cd98f00b204e9800998ecf8427ecache