Ajout des commandes
Ajout des commandes
Merge remote-tracking branch 'origin/eleo'

Conflicts:
	nbproject/private/private.xml
	src/Model/Area.java
	src/View/MainWindow.java