practica1
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/profesor/campos/unidad1/Alumno.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/profesor/campos/unidad1/Alumno.java