Table arrangment
Merge

Conflicts:
	js/map.js
	js/rankings.js