Implementacion de las ofertas.
Merge branch 'Desarrollo' of https://github.com/manu10/teamRocket into Desarrollo

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/comments/_comment.html.erb
	app/views/productos/index.html.erb
	db/schema.rb