knkdsns
Merge branch 'master' of https://github.com/Kal747/AdaKal
d
Merge branch 'master' of https://github.com/Kal747/AdaKal
f
Merge branch 'master' of https://github.com/Kal747/AdaKal

Conflicts:
	class/Galerie.php
	index.php
Merge branch 'master' of https://github.com/Kal747/AdaKal
ff