update
Merge branch 'master' of github.com:a4o2/sass-boiler

Conflicts:
	resources/dev/stylesheets/sass/build/style.scss