fixed bug that occurred for users without a round checking their stats
Merge branch 'master' into statistics
minor touchups to CSS
conflict resolution
more conflict resolution
Merge pull request #27 from nairys/statistics

Statistics & conflict resolution