Query
Query
Merge branch 'master' of https://github.com/luistavarez/Databases-Project

Conflicts:
	Project1/appjs/app.js
	Project1/item.html
	Project1Srv/server.js
	lhlbackup.backup