こみっと
Merge branch 'master' of https://github.com/nyumi/Bamuse.git

Conflicts:
	README.md