Alineamiento de tamaño de botones
Merge branch 'master' of https://github.com/plandevida/IS-VideoClub.git

Conflicts:
	Practica-IS/src/com/bsodsoftware/gameclub/java/gui/VentanaPrincipal.java
Merge branch 'master' of https://github.com/plandevida/IS-VideoClub.git
..