Formulario Vender
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/productos_controller.rb
Merge branch 'master' of https://github.com/Borrajo/DaVinci-Bestnid