foo
Merge branch 'master' of https://github.com/hsasaki00/sample into feature/pre_test3

Conflicts:
	hoge.cpp

foo
Merge pull request #4 from hsasaki00/feature/pre_test3

foo