Spring clean
Merge branch 'master' of https://github.com/csscallum/Boilerplate

Conflicts:
	css/style.css
	sass/base/typography/_1382andup.scss
	sass/base/typography/_519andup.scss
	sass/base/typography/_760andup.scss
	sass/base/typography/_960andup.scss
	sass/base/typography/_base.scss
Conflict fix