update base margins
convert to indents to spaces
Merge branch 'master' of https://github.com/PeteSchuster/Site-Skeleton

Conflicts:
	css/scss/_base.scss