joan screen02
joan scren02
Merge branch 'joan2030'

Conflicts:
	src/com/upv/adm/adm_project_joan/screens/screen02.java