pullのため一旦push
Merge branch 'master' of https://github.com/koshihikari/nisshin

Conflicts:
	bukken-site/app/webroot/less/custom/common.less