changes
Merge branch 'master' of https://github.com/edahlseng/NewsCombinator

Conflicts:
	static/newsCombinator.css
	static/newsCombinator.js
	templates/newsCombinator.html