Signed-off-by: availlant <vaillant.alexis@hotmail.fr>
Merge branch 'HEAD' of https://github.com/levalidator/GenartFull.git

Conflicts:
	build/classes/com/genart/bdd/AccesBDD.class
Merge branch 'HEAD' of https://github.com/levalidator/GenartFull.git
Merge branch 'HEAD' of https://github.com/levalidator/GenartFull.git
Signed-off-by: availlant <vaillant.alexis@hotmail.fr>
Merge branch 'master' of https://github.com/levalidator/GenartFull.git

Conflicts:
	build/classes/com/genart/DAL/DAOCustomer.class
	build/classes/com/genart/servlets/CartServlet.class
	build/classes/com/genart/servlets/ConnexionServlet.class
	build/classes/com/genart/servlets/SaveTempImageServlet.class
Binary files
Signed-off-by: availlant <vaillant.alexis@hotmail.fr>
Liste des artistes

Signed-off-by: availlant <vaillant.alexis@hotmail.fr>
Merge branch 'master' of https://github.com/levalidator/GenartFull

Conflicts:
	build/classes/com/genart/servlets/ConnexionServlet.class