started feeds
Merge branch 'master' into feeds
feed work
Merge branch 'master' into feeds
created basic feed page
fixed conflict