【設計】修正
Merge branch 'master' of https://github.com/kamome-no-sora/muset

Conflicts:
	shared/css/style.css
	shared/js/run.js