bugs :-)
Merge branch 'master' of https://github.com/ejeFi2in3F/biru

Conflicts:
	src/.CollecBrasserie.java.swp