Nico

Agregado icono perfil
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/calendario_mascota.apk
	bin/classes.dex
	bin/classes/com/example/calendario_mascota/R$drawable.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/resources.ap_
	gen/com/example/calendario_mascota/R.java