version 1B
Merge branch 'master' of
ssh://git@github.com/mporiaux2/demogitremote.git

Conflicts:
	src/Machin.java
version 5B
Merge branch 'master' of
ssh://git@github.com/mporiaux2/demogitremote.git

Conflicts:
	src/Machin.java