carrinho de compras adicionado
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/index.xhtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/index.xhtml
Merge remote-tracking branch 'origin/master'
carrinho de compras adicionado