haciendo GestionEmpleado
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Interfaz/Cliente.form
	src/Interfaz/Cliente.java
	src/Interfaz/Empleado.form
	src/Interfaz/Empleado.java
Merge branch 'master' of https://github.com/IsaacDelgado/ProgramaIndumaster

Conflicts:
	src/Interfaz/Empleado.java