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

Conflicts:
	README.md
	hoge.txt