2
Revert "2"

This reverts commit 45a70675936c4f04b4814b6cc3ed8d1a3109d801.
Delete
Merge branch 'master' of https://github.com/anabelaRo/TPIntegradorBBDDII

Conflicts:
	ParteSQL/Punto1.sql