管理者トップきっと完成
複数の編集
Merge branch 'master' of https://github.com/asovote/Touhyou

Conflicts:
	aso/view/kanri_top.html
	aso/view/select_janru.php
	aso/view/vote_change.php
	aso/view/vote_edit_new.php
	aso/view/vote_manage.php
	aso/view/vote_result.php