Merge pull request #24 from nairys/statistics

conflicts resolved and more refactoring
changed style
Merge branch 'master' into styling
fixed bug that occurred for users without a round checking their stats
styling changes
Merge pull request #25 from nairys/styling

Styling update
Merge branch 'master' into statistics
Added stuff
Resolved conflicts
Merge pull request #26 from nairys/ActiveRecordstuff

Active recordstuff
minor touchups to CSS
conflict resolution
more conflict resolution