Local
Carrito 1
Repair
Merge branch 'master' of https://github.com/gchiappe/tf_prograinter.git

Conflicts:
	WebContent/includes/registroUsuario.xhtml
	src/com/ejemplo/dto/Pedidos.java