modification de l'init des chateaux
Merge branch 'master' of https://github.com/bigjulien/simplewars.git

Conflicts:
	src/affichage/Frame.java
	src/affichage/PanelInformations.java
	src/main/Controlleur.java
Version sans probleme, yolo