Deletes
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store
	.sass-cache/bf196f894ee25964c3ccdec553675f97e19ec3ef/_base.scssc
	.sass-cache/bf196f894ee25964c3ccdec553675f97e19ec3ef/_modules.scssc