Test de branching
Conflict test 1
Merge branch 'maxime'
Conflict test 2
Conflict from master
Merge branch 'maxime'

Conflicts:
	me.txt