reglage de bug.
Merge branch 'develop' of https://github.com/WardenQQ/BeerProject into develop

Conflicts:
	src/modele/CouleurModele.java