Comienzo Listas Ranking
Termino Lista de Rankings, creo
Merge remote-tracking branch 'origin/master'

Conflicts:
	BeatIt/res/layout/ranking.xml
	BeatIt/res/values/strings.xml
	BeatIt/src/com/g6pis/beatit/MainActivity.java
	BeatIt/src/com/g6pis/beatit/Ranking.java