タイトル変更（新宿）
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	app/views/layouts/application.html.erb