Merge branch 'master' of https://github.com/nao215/zanryuchu5
Merge branch 'master' of https://github.com/nao215/zanryuchu5
ujie
Merge remote-tracking branch 'origin'

Conflicts:
	app/assets/stylesheets/custom.css.scss
ujike
Merge branch 'master' of https://github.com/nao215/zanryuchu5