Revert "."

This reverts commit b2a8f3fad668e3c72c80079d08f378dadc96e593.
Merge branch 'master' of https://github.com/PAPW-BDM/ProyBDMPAPW

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