moved all the matching logic to the user model
stats view
resolved merge conflicts
Merge pull request #42 from nemrow/more_stats

More stats