odd merge conflict with lost follow button
Merge branch 'master' of github.com:NathanHo28/Biblio
made user feed render in it's own view through a new route
changed user sessions controller to redirect to feed_path when logged in instead of stories_path
merge conflict in stories/index.html.erb