Version 5 par MP1
Version 5b par MP2
Merge branch 'master' of https://github.com/mporiaux/remotedemogit3.git

Conflicts:
	src/demogit3/Truc.java
V6 Ajout de Bazard par MP1
ajout v2 bazard par mp1
ajout v2 bazard par mp1
Merge branch 'master' of https://github.com/mporiaux/remotedemogit3.git

Conflicts:
	src/demogit3/Bazard.java
v3 bazard par mp1
v3 bazard par mp2
Merge branch 'master' of https://github.com/mporiaux/remotedemogit3.git

Conflicts:
	src/demogit3/Bazard.java
Merge branch 'master' of https://github.com/mporiaux/remotedemogit3

Conflicts:
	src/demogit3/Truc.java