copy updates
Merge branch 'nb/styles/type' of github.com:devs-for-change/main-site into nb/styles/type

Conflicts:
	app/views/pages/index.html.slim