server side fixes
Merge branch 'master' of github.com:mbryk/SetChampions