modify0
Merge pull request #12 from y-inoue-/rebase_test0

Rebase test0
Merge branch 'master' of https://github.com/y-inoue-/github_sandbox
modify1_1
Merge branch 'rebase_test1_1' into rebase_test1

Conflicts:
	test.txt