Signed-off-by: Yann <nayplatypusmith@live.fr>
Signed-off-by: Yann <nayplatypusmith@live.fr>
Merge branch 'master' of https://github.com/Ysnir/PiixColor.git

Conflicts:
	bin/piixcolor/controleur/AdminControleur.class
	bin/piixcolor/controleur/Controleur.class
	bin/piixcolor/controleur/PlateauControleur.class
	bin/piixcolor/test/ImageHelper.class
	bin/piixcolor/utilitaire/Couleur.class
	bin/piixcolor/utilitaire/Listing$1.class
	bin/piixcolor/utilitaire/Listing$2.class
	bin/piixcolor/utilitaire/Listing.class
	bin/piixcolor/vue/Fenetre.class
	bin/piixcolor/vue/Vue$SwitchViewListener.class
	bin/piixcolor/vue/Vue.class
	bin/piixcolor/vue/VueAccueil.class
	bin/piixcolor/vue/VueAdmin$1.class
	bin/piixcolor/vue/VueAdmin$2.class
	bin/piixcolor/vue/VueAdmin$3.class
	bin/piixcolor/vue/VueAdmin$4.class
	bin/piixcolor/vue/VueAdmin.class
	bin/piixcolor/vue/VuePlateau.class
	src/piixcolor/utilitaire/Couleur.java
	src/piixcolor/utilitaire/Listing.java
	src/piixcolor/vue/Fenetre.java
	src/piixcolor/vue/VueAdmin.java

Signed-off-by: Yann <nayplatypusmith@live.fr>
Merge pull request #10 from Porquepix/master

Recup
Merge branch 'master' of https://github.com/Ysnir/PiixColor.git

Conflicts:
	bin/piixcolor/vue/VueAdmin$1.class
	bin/piixcolor/vue/VueAdmin$2.class
	bin/piixcolor/vue/VueAdmin$3.class
	bin/piixcolor/vue/VueAdmin$4.class
	bin/piixcolor/vue/VueAdmin.class

Signed-off-by: Yann <nayplatypusmith@live.fr>
Signed-off-by: Yann <nayplatypusmith@live.fr>
Liaison VuePlateau - Config


Signed-off-by: Yann <nayplatypusmith@live.fr>
Merge pull request #44 from Ysnir/master

Recup