third commit

文章の追加
Merge https://github.com/yuki-takahashi/sample

Conflicts:
	sample.txt