commitの説明を追加
Merge branch 'master' of https://github.com/ashlaman/Repository_test

Conflicts:
	sample.txt