version 7B pour accepter conflits
Merge branch 'master' of ssh://git@github.com/mporiaux2/demogitremote.git
Merge branch 'master' of
ssh://git@github.com/mporiaux2/demogitremote.git

Conflicts:
	src/Machin.java