joan 17:48
Merge branch 'master' of
ssh://git@github.com/Joanv12/adm_personal_places.git

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