Update
Basic structuring for feed
Add feed function
Fix merge conflicts
updated server
fixed merge conflicts