ブランチ反映（コミットテスト）
Merge branch 'master' of https://github.com/CreatorsLabTech/sample into sample_branch

Conflicts:
	sample.txt
branch2
master2

Conflicts:
	sample.txt
Merge branch 'master' of https://github.com/CreatorsLabTech/sample into HEAD

Conflicts:
	sample.txt
開発中のもの
ブランチ反映（コミットテスト）

Conflicts:
	sample.txt
branch2

Conflicts:
	sample.txt
Merge branch 'sample_branch' of https://github.com/CreatorsLabTech/sample into sample_branch

Conflicts:
	sample.txt