Merge pull request #1 from Jiashuai/master

add the Tel.
ok!
update packages.
Merge remote-tracking branch 'origin/master'
db connection!
db config!
first commit
change config!
complete!
delete unused code.
Merge remote-tracking branch 'upstream/master'
merge
merge
Merge branch 'master' of https://github.com/hoveagle/HomeSite into hoveagle-master

Conflicts:
	public/data/contact.json
save my files
merge