sass
Merge branch 'master' of github.com:kato-takashi/dotInstall

Conflicts:
	sass/css/main.css
	sass/scss/main.scss