In progress changes
Merge branch 'master' of https://github.com/gholtslander-va/vendladder

Conflicts:
	src/main.py
	src/templates/sc2/admin/main.html
	src/templates/sc2/admin/player/create.html
More merging