p追加
Merge branch 'master' of github.com:yonekura907/start-git

Conflicts:
	text.txt