石川変更
Merge branch 'work' of https://github.com/haityu/haityu

Conflicts:
	README.md
Merge remote-tracking branch 'origin/work'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/haityu/haityu

Conflicts:
	README.md
石川変更
Merge branch 'master' of https://github.com/haityu/haityu

Conflicts:
	README.md