login con pifias
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/calendario_mascota.apk
	bin/classes.dex
	bin/classes/com/example/calendario_mascota/LoginActivity$1.class
	bin/classes/com/example/calendario_mascota/MenuActivity.class
	bin/classes/com/example/calendario_mascota/PerfilActivity.class
	bin/classes/com/example/calendario_mascota/R$id.class
	bin/classes/com/example/calendario_mascota/R$layout.class
	bin/classes/com/example/calendario_mascota/R$menu.class
	bin/classes/com/example/calendario_mascota/R$string.class
	bin/classes/com/example/calendario_mascota/R$style.class
	bin/classes/com/example/calendario_mascota/lib/EventoAdapter.class
	bin/resources.ap_
	gen/com/example/calendario_mascota/R.java