implement new box-sizing default: fixes #34
settings: update and extend default colors, fixes #30
Merge branch 'master' of github.com:getchopstick/chopstick-boilerplate into feature--html-snippets

* 'master' of github.com:getchopstick/chopstick-boilerplate:
  settings: update and extend default colors, fixes #30
  implement new box-sizing default: fixes #34

Conflicts:
	scss/_settings.scss