fujii test
コメントテスト
Merge branch 'HEAD' of https://github.com/fujii111/hondana into HEAD

Conflicts:
	app/controllers/application_controller.rb