5tt
Merge remote-tracking branch 'origin/master'

* origin/master:
  Busqueda Completa

Conflicts:
	bestnid-grupo2/app/controllers/productos_controller.rb
	bestnid-grupo2/app/models/producto.rb
	bestnid-grupo2/app/views/productos/index.html.erb