add rspec floundering
what a bunch of crap
add more merge stuff
Merge branch 'master' of https://github.com/lrakhman/fit-fight into rspec-work
Merge branch 'master' of https://github.com/lrakhman/fit-fight into rspec-work
Merge branch 'master' of https://github.com/lrakhman/fit-fight into rspec-work
add sync in user_show route and button functionality
add ajax request to update stats
merged with master
add total stats jquery/ajax - STILL ON ERB PAGE
Merge branch 'master' of https://github.com/lrakhman/fit-fight into manual-sync
add redirection condition if a user does not have an email
Merge pull request #29 from lrakhman/email-redirection

Email redirection