Add TODO to User Model - Not currently working. Worked on user controller.
Merge branch 'master' into jenn_steve/user_profile_and_newsfeed
Merge pull request #4 from mud-turtles-2014/jenn_steve/user_profile_and_newsfeed

Jenn steve/user profile and newsfeed