modif
bien resolu
Merge branch 'master' of github.com:pascalafourcade/clermontech-git

Conflicts:
	README