v3 bazard par mp2
Merge branch 'master' of https://github.com/mporiaux/remotedemogit3.git

Conflicts:
	src/demogit3/Bazard.java