Fixed bugs
Fixed conflicted files
Fixing conflicted files-intermediate stage
Merge branch 'master' of https://github.com/bluetomatoes/rankingsystem

Conflicts:
	elo.py