maj
Merge branch 'master' of https://github.com/imie-source/LEONNIE

Conflicts:
	site/index.html
Merge branch 'master' of https://github.com/imie-source/LEONNIE

Conflicts:
	site/index.html
Merge branch 'master' of https://github.com/imie-source/LEONNIE
Merge branch 'master' of https://github.com/imie-source/LEONNIE
ajout