la modif qui doit contenir le conflit
Merge branch 'master' of github.com:boukala/clermontech-workshop-1

Conflicts:
	README.md