added database support
Added support to database
remove package.json
ignored files
Revert "ignored files"

This reverts commit 1e25c156541feb30e233ffb5890ca517bbeac622.
merge main
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mockup/server.js
merge upstream
fixed