cambios imagenes por url
Merge branch 'Desarrollo' of https://github.com/manu10/teamRocket into Desarrollo

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb