Merge branch 'master' of https://github.com/Borrajo/DaVinci-Bestnid

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

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