added user stats
Merge remote-tracking branch 'origin/master' into user-profile
Doing the thing with the things

Added cancel to make story.
User profile logic
Merge remote-tracking branch 'origin/master' into user-profile
Merge remote-tracking branch 'origin/master' into design
Changed nav link url for profile page
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word
Merge remote-tracking branch 'origin/master' into User