un super commit message youppie, !!! vive le commit message
Merge branch 'master' of https://github.com/FXHibon/tpconcur

Conflicts:
	src/prog2/concur/exercice1/Philosophe.java