25:03:14:23 , effacer tout et reprendre ça
Merge branch 'master' of
https://github.com/projetmiageM1CS/mock_ebay.git

Conflicts:
	ebayProject/WebContent/polo.jsp