Fecha solucion
Merge branch 'master' of https://github.com/PAPW-BDM/ProyBDMPAPW

Conflicts:
	nbproject/private/private.xml
	src/java/Database/Video.java