更正bug
debug

Conflicts:
	app/assets/stylesheets/application.scss