コメント変更
Merge branch 'master' of https://github.com/naaominnie/gitbootcamp

Conflicts:
	test.txt