new changes made
Merge branch 'master' of https://github.com/juliansantaana/dptoalumnos

Conflicts:
	build/classes/dptoalumnos/Alumno.class
	build/classes/dptoalumnos/Controlador$funcionSendAltaAlumno.class
	build/classes/dptoalumnos/Modelo.class
	build/classes/dptoalumnos/Vista.class
	nbproject/private/private.properties
	src/dptoalumnos/Controlador.java
	src/dptoalumnos/Vista.java