Added feed page
Merge branch 'master' of github.com:SourceNews/source-news

Conflicts:
	public/js/script.js