commit pour faire un pull
Merge branch 'master' of https://github.com/medjo/POO-Robots_Pompiers

Conflicts:
	src/ManagerChef.java