Lets try that
Merge remote-tracking branch 'origin/try'

Conflicts:
	local/bin/wargame/src/wargame/FenetreJeu.java
Correction de Fenetre
Ajout du schema uml