commit de la super clase de angel
Merge branch 'angel_01'

Conflicts:
	bin/classes/com/upv/adm/adm_project_joan/screens/screen02.class