Test12
Merge branch 'master' of https://github.com/SydneyBecu/ProjetGl.git

Conflicts:
	src/main/java/metier/Cellule.java
Merge branch 'master' of https://github.com/SydneyBecu/ProjetGl.git

Conflicts:
	src/main/java/metier/Cellule.java
J'ai commit