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

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

+ Ajout page account

Conflicts:
	build/classes/com/genart/servlets/CartServlet.class
Merge branch 'master' of https://github.com/levalidator/GenartFull

Conflicts:
	build/classes/.gitignore
	build/classes/com/genart/DAL/DAOCustomer.class
	build/classes/com/genart/bdd/AccesBDD.class
	build/classes/com/genart/servlets/AdminServlet.class
	build/classes/com/genart/servlets/CartServlet.class
	build/classes/com/genart/servlets/CustomerDbServlet.class
	src/.DS_Store
	src/com/genart/bdd/AccesBDD.java
Merge branch 'master' of https://github.com/levalidator/GenartFull
Merge branch 'master' of https://github.com/levalidator/GenartFull
Merge branch 'master' of https://github.com/levalidator/GenartFull
test
MyAccount
Merge branch 'master' of https://github.com/levalidator/GenartFull