modified user.rb's
Merge pull request #4 from kunovsky/controllers

Controllers
Merge pull request #5 from kunovsky/e_j_controller

modified user.rb's
Merge pull request #6 from kunovsky/stats

Stats
working mvp...sort of
Merge pull request #7 from kunovsky/controllers

working mvp...sort of
Finished History and Stats, few minor bug squashes..MVP