初始化提交
Merge branch 'master' of https://code.jd.com/weiqianglord/web2jd

Conflicts:
	README.md
update the database setting