cosas y más cosas
bueno, a ver
:w  Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes.dex
	bin/classes/edu/tesis/healthyfood/BuscaRecetas.class
	bin/classes/edu/tesis/healthyfood/Ingredientes.class
	bin/classes/edu/tesis/healthyfood/MainActivity$1.class
	bin/classes/edu/tesis/healthyfood/MainActivity.class
	bin/classes/edu/tesis/healthyfood/MenuPrincipal.class
	bin/classes/edu/tesis/healthyfood/MisRecetas.class
	bin/classes/edu/tesis/healthyfood/PublicaReceta$UploaderTask.class
	bin/classes/edu/tesis/healthyfood/PublicaReceta.class
	bin/classes/edu/tesis/healthyfood/R$drawable.class
	bin/classes/edu/tesis/healthyfood/R$id.class
	bin/classes/edu/tesis/healthyfood/R$layout.class
	bin/classes/edu/tesis/healthyfood/R$menu.class
	bin/classes/edu/tesis/healthyfood/R$string.class
	bin/classes/edu/tesis/healthyfood/R$style.class
	bin/classes/edu/tesis/healthyfood/Registro.class
	bin/dexedLibs/apache-mime4j-0.6.1-5e1768fc6fbe967375f5f8203668f9d2.jar
	bin/dexedLibs/httpclient-4.3.4-cab26a925420f00ca59e3d9fb9713724.jar
	bin/dexedLibs/httpcore-4.3.2-e7ae88f655a575dc5b74133d33b8fc35.jar
	bin/dexedLibs/httpmime-4.3.4-8845be8356b45b57f93afdb690272134.jar
	bin/res/crunch/drawable-hdpi-v11/ic_launcher.png
	bin/res/crunch/drawable-hdpi-v11/ic_launcher_start.png
	bin/res/crunch/drawable-hdpi-v11/ic_stat_icono_camara.png
	bin/res/crunch/drawable-hdpi-v9/ic_launcher_imagen.png
	bin/res/crunch/drawable-mdpi-v11/ic_launcher.png
	bin/res/crunch/drawable-mdpi-v11/ic_launcher_start.png
	bin/res/crunch/drawable-mdpi-v11/ic_stat_icono_camara.png
	bin/res/crunch/drawable-mdpi-v9/ic_launcher_imagen.png
	bin/res/crunch/drawable-xhdpi-v11/ic_launcher.png
	bin/res/crunch/drawable-xhdpi-v11/ic_launcher_start.png
	bin/res/crunch/drawable-xhdpi-v11/ic_stat_icono_camara.png
	bin/res/crunch/drawable-xhdpi-v9/ic_launcher_imagen.png
	bin/resources.ap_
	gen/edu/tesis/healthyfood/R.java