Updated Core SCSS files
Merge branch 'master' of https://github.com/joshhannan/responsive-boilerplate

Conflicts:
	css/_mixins.scss
	css/_var.scss