dd yu.txt
mOi aussi master
Merge branch 'fonct1'

Conflicts:
	cOucOu.txt
Merge branch 'master' of https://github.com/arni360/tOtOte
commit yuping
Merge remote-tracking branch 'origin/oula'