model tests pass
dao tests pass
rankings wip
fixed rating calculator to work with ratings dict
rankings still wip
rankings tests pass
server tests pass. all tests pass
change merge players to also merge regions
db migration done, fixed region dropdown
fix get_all_players query and remove unnecessary capitalization code in dropdown
fix webapp to work with new region object
fix player list page to work with new regions
fix rating display on player detail page
Merge branch 'database'

Conflicts:
	test/test_rankings.py
	webapp/player_detail.html