major db additions, breaks some functionality
Pulling
Merge branch 'db' of https://github.com/umass-cs-326/team-pinndit

Conflicts:
	pinndit-app/routes/index.js
Pulling
Merge branch 'master' of https://github.com/umass-cs-326/team-pinndit
Pulling
Merge branch 'master' of https://github.com/umass-cs-326/team-pinndit

Conflicts:
	database/setup/dummyData.sql
	pinndit-app/lib/db/dbFunc.js