DB
あああ
確認
Merge branch 'master' of https://github.com/asovote/Touhyou

Conflicts:
	aso/view/include_path.php
ああああああ
Merge branch 'master' of https://github.com/asovote/Touhyou