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

Conflicts:
	Project1/appjs/app.js