変更しますよー。
add Naoko
Merge branch 'conflict-practice' of https://github.com/pakiran/sample_app into conflict-practice