Merge branch 'master' of https://github.com/roioteromorales/LeagueOfLegendsAPP

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'