スタイルの変更
Merge branch 'master' of github.com:s-hiroshi/base_site_ci

Conflicts:
	css/style.min.css
	dev/css/style.css
	dev/package.json