coucou
Merge branch 'master' of https://github.com/ejeFi2in3F/biru

Conflicts:
	src/InterfaceGraphique.class
	src/ModeleTabBreuvage.class