削除
変更
Merge branch 'master' of https://github.com/kcogura/karte_account

Conflicts:
	dbh.php
	utils.php