carrinho de compras
Merge branch 'master' of https://github.com/henriquemarques/trabalhoes

Conflicts:
	app/Controller/OrdersController.php