retrieved the data from the database to put into the feed but for some reason it is now showing up on the webpage
Merge branch 'master' of github.com:liquidtrends/socialhack

Conflicts:
	public/templates/feed.html