Welcomeを編集しました
Merge branch 'ychubachi/add_address_book'
Conflict
Merge branch 'ychubachi/conflict'

Conflicts:
	app/views/welcome/index.html.erb