fix some possible merge errors?
adjust index
Merge branch 'skwak'
refactor index
refactor index
fix merge
remove duplicat else and end
remove extra else statement
refactor so that feeds are tied to users, and that's what shows on home page