General typographic tweaks
More typography tweaks to full width article
Merge branch 'typography-tweaks' of github.com:jolankester/frontend-www

Conflicts:
	templates/sass/main.scss
	templates/stylesheets/main.css
Merge branch 'master' of github.com:theodi/frontend-www