sprint10 eterno
sprint10 eterno
Merge branch 'master' of https://github.com/yepesasecas/golazzos2

Conflicts:
	app/assets/stylesheets/users.css.scss
	app/views/home/index.html.erb
	app/views/users/show.html.erb