テスト
Merge branch 'master' of https://github.com/hsasaki00/sample into feature/pre_study2

Conflicts:
	sample.cpp

コンフリクト解消
Merge pull request #6 from hsasaki00/feature/pre_study2

テスト