排除数据库设置文件
Merge branch 'master' of https://github.com/pyzn/testBlog.git

Conflicts:
	.gitignore