Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
layout修正
modify layout
assets precompile
modify layout
assets precompile
assets precompile
modify layout
assets precompile
modify layout
assets precompile
modify layout
assets precompile
アクセスのレイアウトを修正
Merge remote-tracking branch 'origin/layout' into layout

Conflicts:
	app/assets/stylesheets/style.css.scss
Merge remote-tracking branch 'origin/layout'

Conflicts:
	app/assets/stylesheets/style.css.scss