Rien rien
Merge branch 'master' of https://github.com/bigjulien/simplewars.git

Conflicts:
	src/affichage/AfficheurCellule.java
	src/main/Controlleur.java