Deploy point 4: Borrar alumno (Atencion!)
Deploy point 4: Borrar alumno (Atencion!)
Merge branch 'master' of https://github.com/olivellaf/gestioAlumnes

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/NUCLI/CAplicacio.java