Seccion de ayuda
Merge branch 'Desarrollo' of https://github.com/manu10/teamRocket into Desarrollo

Conflicts:
	app/views/devise/registrations/new.html.erb