finishing doing #75776390
finshing #75776798
[#75776798] hell
adding webserver and testing
Merge branch 'master' of github.com:iamezell/thefeed into upstream/master

Conflicts:
	README.md