adding line to readme to create database tables with db migration
conflict resolved
Merge remote-tracking branch 'upstream/development' into development
adding npm start to package.json as replacement to starting server with make
Make 'npm start' fail if db migration fails.