タイトル変更しましたよ
Merge branch 'master' of github.com:wakayanagit/healthcare

Conflicts:
	LnlnFanSite/LnlnFanSite/Views/Home/Index.cshtml