probado en casa
Merge branch 'master' of github.com:ijara/letemmo

Conflicts:
	app/models/summoner.rb
	config/routes.rb