へんこう
Merge branch 'master' of github.com:ytakanis/neko

Conflicts:
	README.md