cart y user quitados!!
Merge branch 'master' of https://github.com/marceluscantus/BH

Conflicts:
	app/controllers/catalog_controller.rb