さいたま追加
Merge branch 'master' of https://github.com/ikeryou/tutorial

Conflicts:
	sample.txt