corrected error on database
corrected error on database
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/dbConnection.js
created functional testing(not working - need help lol)