ñkjgklhcv
thjgjfgh
dasfadsgfasdfas
aaaaaaaaaaaaaaaaaaaaaaaaa
ry7t7uif
Merge remote-tracking branch 'origin/master'

Conflicts:
	AlmacenDePlantas/.classpath
	AlmacenDePlantas/AndroidManifest.xml
	AlmacenDePlantas/bin/AlmacenDePlantas.apk
	AlmacenDePlantas/bin/AndroidManifest.xml
	AlmacenDePlantas/bin/classes.dex
	AlmacenDePlantas/bin/resources.ap_
	AlmacenDePlantas/res/layout/activity_main.xml
	AlmacenDePlantas/res/menu/menu.xml
	AlmacenDePlantas/res/values-en/strings.xml
	AlmacenDePlantas/res/values/strings.xml