Merge branch 'master' of https://github.com/SugimotoSohei/Syofoo

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