Fixed position of article
Merged in master
Lots of little style nits.
Merge remote-tracking branch 'origin/master' into Design-sidebar-move

Conflicts:
	static/css/style.css
	templates/header.html