htaccess
Merge branch 'master' of https://github.com/u2ku2k/honkouji

Conflicts:
	.htaccess
もろもろ
Merge branch 'master' of https://github.com/u2ku2k/honkouji