pull説明の追加
Merge branch 'master' of https://github.com/legendhome/repotest

Conflicts:
	sample.txt