aiueo
Merge pull request #1 from yuta-amano/develop

Develop
hugahuge
Merge branch 'master' of https://github.com/yuta-amano/ext-test into develop

Conflicts:
	hoge.txt
yah
Merge branch 'master' of https://github.com/yuta-amano/ext-test into develop

Conflicts:
	hoge.txt