purely for merge
Merge branch 'master' of https://github.com/fightking/glicko

Conflicts:
	index.html