created a drop down for our navabr that only applies when the user is logged in
Merge branch 'master' into jill
no message
no message
took followers function out of routes and working on route for profile page, and moved the function into posts controller, fixed some tagging and modal issues
Merge pull request #30 from TAwesome/jill

Cool I guess *eyes-roll*
Merge branch 'master' into Jacob
Merge pull request #31 from TAwesome/Jacob

Jacob
Merge branch 'master' into Jacob