README modifie par le master
Merge branch 'master' of github.com:gidehault/workshop-clermontech

Conflicts:
	README