Arrivent les soucis
Merge branch 'ça-va-conflictuer!'

Conflicts:
	dossier1/Téo exprime ses sentiments towards Idrisse.txt
Merge remote-tracking branch 'origin/master'