Casi fin
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/productos/edit.html.erb
	app/views/productos/index.html.erb