modified:   README.md
Merge branch 'dev' of https://github.com/ploko/curling into dev

Conflicts:
	README.md
Fichier texte pour exploiter le serveur
Merge branch 'dev' of https://github.com/ploko/curling into dev