Alvin Ranking
Merge branch 'master' into Alvin
fix
Merge branch 'Alvin'

Conflicts:
	index.html
	ranking.html