con mapas
Merge branch 'master' of https://github.com/Alebmurillo/TP1-Moviles

Conflicts:
	ClinicAppCR/gen/com/example/clinicappcr/R.java