-
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
made changes to the bottom rank and score stat in the results end page
Merge remote-tracking branch 'origin/master'