Bedrock with _s Wordpress theme commit
gitignore sass
Merge branch 'master' of https://github.com/garrettboatman/bedrock_joints

Conflicts:
	.gitignore
	web/app/themes/_s/scss/_settings.scss