commit
jjj
Merge branch 'master' of https://github.com/maxnicpie/projetpoo.git

Conflicts:
	ProjetPOO/src/Domaine.java
Merge branch 'master' of https://github.com/maxnicpie/projetpoo.git

Conflicts:
	ProjetPOO/src/Domaine.java