Ajout du catalogue et de la mise en panier
Merge branch 'master' of
https://github.com/MathieuWickers/TPAssociation.git

Conflicts:
	Tp_Association/.classpath
	Tp_Association/WebContent/jsp/accueil.jsp
	Tp_Association/src/org/licpro/servlet/frontController.java