Carrito
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/principal.php
	application/views/producto_view.php
	application/views/tienda_view.php