identaciones correctas
Merge remote-tracking branch 'origin/master'

* origin/master:
oferta/pregunta

Conflicts:
	app/views/productos/show.html.erb
Merge branch 'master' of https://github.com/Borrajo/DaVinci-Bestnid

* 'master' of https://github.com/Borrajo/DaVinci-Bestnid:
  Revert "oferta/pregunta"

Conflicts:
	app/views/productos/show.html.erb