Add hogehoge
Add foobar
Merge pull request #1 from ogis-yano/test

Test
Add hi
Merge branch 'master' of https://github.com/ogis-yano/merge-squash-test
Merge branch 'master' into conflict

Conflicts:
	README.md