cosa
Merge branch 'master' of https://github.com/plandevida/IS-VideoClub.git

Conflicts:
	Practica-IS/src/app/bsodsoftware/gameclub/java/gui/paneles/PrestamosPanel.java
	Practica-IS/src/app/bsodsoftware/gameclub/java/modelo/SistemaJuegos.java
	Practica-IS/src/app/bsodsoftware/gameclub/java/modelo/SistemaUsuarios.java