add test1-jiro
modifed conflict
modified conflict
modified conflict
modifed conflict
modified conflict
Merge branch 'test1-jiro' of github.com:yuuinaka/experiment into test1-jiro

Conflicts:
	README.md
Merge pull request #2 from yuuinaka/test1-jiro

add test1-jiro