ぴよをなおしたよ
Merge branch 'develop' of https://github.com/takumin4811/GitTest into develop

Conflicts:
	piyopiyo.txt