Changes to be committed:
	new file:   88.txt
git push 88.txt
Add 99.txt
modified 99.txt
delete 88.txt
Add
Merge pull request #1 from arni360/branche1

First fill in branche1
correction faute de frappe
ajout ligne
dd yu.txt
mOi aussi master
Merge branch 'fonct1'

Conflicts:
	cOucOu.txt
Merge branch 'master' of https://github.com/arni360/tOtOte
commit yuping
Je rajoute cette ligne
hey listen
coucou
suppression
22222 to master
Merge branch 'hey' of https://github.com/arni360/tOtOte into oula