joan 17:19
mobileAngel 17:20
angel, merge nuestras ramas, 17:30
angel 17:35
angel bin 17:37
Merge branch 'movilAngel'

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