Merge branch 'master' of github.com:jesse108/dache

Conflicts:
	.gitignore
更新数据库相关代码
update ignore
创建前端页面PHP
Merge branch 'master' of github.com:jesse108/dache

Conflicts:
	.gitignore