5th_local
Merge branch 'master' of github.com:ShimadaShingo/RailsTest05

Conflicts:
	app/controllers/mst_jinins_controller.rb