test1
Merge pull request #1 from t-matsuno/test1

test1
modified in hoge
Merge pull request #2 from t-matsuno/hoge

modified in hoge
test2
Merge pull request #3 from t-matsuno/hoge2

test2
Merge branch 'master' into feature_1

Conflicts:
	README.md
Merge branch 'feature_1' into feature_2

Conflicts:
	README.md