hmssを追加
Merge branch 'master' of https://github.com/gushikenhikaru/local-repo01

Conflicts:
	test.txt