Added initial set up for feed page
Merge heads