modification fichier1
modification fichier 2
Création Fichier 3
test
hum!!
commit fid
COmmit propre
hum!!

Conflicts:
	fichier1.txt
Commit
test

Conflicts:
	fichier1.txt
magnifique commit !
commit kevin
plop
Merge branch 'master' of https://github.com/spasdeloup/formation_git into patate

Conflicts:
	fichier1.txt
Merge branch 'patate' of https://github.com/spasdeloup/formation_git into patate