modified:   README.md
	modified:   README.md
J'essaye des trucs
What ?
	modified:   README.md
	modified:   README.md
Merge branch 'dev' of https://github.com/ploko/curling into dev
Merge branch 'dev' of https://github.com/ploko/curling into dev

Conflicts:
	README.md
	new file:   coucou.txt
Fichier texte pour exploiter le serveur
Merge branch 'dev' of https://github.com/ploko/curling into dev
Added UC diagram.
	new file:   Diagramme.java
Merge branch 'dev' of https://github.com/ploko/curling into dev
	modified:   README.md
Created "Diagramms" directory.
	deleted:    Diagramme.java
	new file:   Diagramms/UseCases.java
	deleted:    coucou.txt
	deleted:    test.txt
Y'avait LAGANE Morgan, j'ai mis Alexandre
	typechange: Diagramms/UseCases.java
Merge branch 'dev' of https://github.com/ploko/curling into dev
	new file:   test.txt
Merge branch 'dev' of https://github.com/ploko/curling into dev