ajout d'une ligne en local
Merge branch 'master' of https://github.com/dhatsch/clermontech

Conflicts:
	lapin

resolverd