Libreria de oracle
Merge branch 'master' of https://github.com/fucking007/PrimeraFaseAyD1

Conflicts:
	Tienda/pom.xml
	.git/MERGE_HEAD

	modified:   Tienda/pom.xml
	deleted:    Tienda/src/main/java/asd.txt
	deleted:    Tienda/src/main/resources/asd.txt
	new file:   Tienda/src/test/java/Logica/ProductoTest.java