commitの説明を追加
pullの説明を追加
Merge branch 'issue1'

Conflicts:
	myfile.txt