master-commit
Merge branch 'master' of github.com:style-design/wbkagawa

Conflicts:
	README.md