changes so that user can only see feed if logged in
merge conflicts