Merge branch 'master' of https://git.dashgame.com/919693957/Tools
# Conflicts:
# .gitignore
# README.md
# application/admin/controller/Good.php
# application/admin/view/Base/left.html
# application/database.php
# application/index/controller/Base.php
# application/index/controller/Indexs.php
# extend/.gitignore
# runtime/.gitignore
