Merge branch 'master' of github.com:ftngrn/theater-labo

Conflicts:
	.htaccess
ブログURLの設定 closes #15 @0.5