user 2 modif
Resolution du conflit

Merge branch 'master' of /Users/pascal/SANDBOXGIT/user2/../blessed

Conflicts:
	README
debut
plus de conflit

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

Conflicts:
	README