première phrase
nain porte quoi
Yeah
Correction
Dernier commit
Merge branch 'ligne2' of github.com:imie-source/IMIE-cadavre-exquis into ligne1
Extra

Conflicts:
	histoire.txt
Merge branch 'ligne1' of github.com:imie-source/IMIE-cadavre-exquis into ligne1

Conflicts:
	histoire.txt
Merge branch 'ligne1' of github.com:imie-source/IMIE-cadavre-exquis into ligne1

Conflicts:
	histoire.txt
test2