created home page with newsfeed
Merge branch 'home_page'

merging
fixed merge con