arreglado cargarSpree
Merge branch 'entrega3' of https://github.com/jjvelascog/pagina into entrega3

Conflicts:
	app/controllers/welcome_controller.rb