database
Merge remote-tracking branch 'origin/master'

Conflicts:
	models/db.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	routes/product.js
	views/homepage.ejs
ziteng-product
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js