nada
Merge remote-tracking branch 'origin/entregable' into Oman-rails
config BD
Cambio vista lista de libros
Merge remote-tracking branch 'origin/entregable' into Oman-rails

Conflicts:
	cookbooks/Gemfile.lock
	cookbooks/app/views/books/show.html.erb
	cookbooks/config/database.yml
Boludeces del carro de compras
Merge remote-tracking branch 'origin/Oman-rails' into entregable
Remover del carro, carro más lindo, tags al form de libro, etc