closed #24
closed #24
Merge branch 'master' of github.com:ayafujiaya/shibuhouse_new_web

Conflicts:
	text/bio_explain/osu.php