test3 edited on feature_2
Merge pull request #4 from t-matsuno/hoge

test3 edited on feature_2
test4 edited on feature_2
Merge pull request #5 from t-matsuno/hoge

test4 edited on feature_2
Merge branch 'master' into feature_2

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

Conflicts:
	README.md
test5 on feature_2
Merge pull request #12 from t-matsuno/hoge

test5 on feature_2
Merge branch 'feature_2'

Conflicts:
	README.md