Merge branch 'master' of https://github.com/Deuces/Hackaton

Conflicts:
	GlobalRating/view.py
final