de todo un poco
Merge branch 'master' of https://github.com/norcasitas/GimnasioCostaNorte

Conflicts:
	Gym/build.xml
	Gym/build/classes/Interfaces/AcercaDe.class
	Gym/build/classes/Interfaces/LoginGUI.class
	Gym/nbproject/private/private.properties
	Gym/nbproject/project.properties
	Gym/src/Controladores/ControladorAbmCliente.java
cosas del dedito