descartar
descartar
Merge branch 'master' of https://github.com/bravo99/zeron

Conflicts:
	Vegeta/bin/classes/android/support/v7/appcompat/R$styleable.class
	Vegeta/bin/classes/com/example/vegeta/BuscarIngredienteActivity$1$1.class
	Vegeta/bin/classes/com/example/vegeta/BuscarIngredienteActivity$1.class
	Vegeta/bin/classes/com/example/vegeta/Error.class
	Vegeta/bin/classes/com/example/vegeta/Form.class
	Vegeta/bin/classes/com/example/vegeta/FormIngrediente$1.class
	Vegeta/bin/classes/com/example/vegeta/FormIngrediente.class
	Vegeta/bin/classes/com/example/vegeta/FullscreenActivity$3.class
	Vegeta/bin/classes/com/example/vegeta/FullscreenActivity.class
	Vegeta/bin/classes/com/example/vegeta/ImageLoader$PhotosLoader.class
	Vegeta/bin/classes/com/example/vegeta/Ingred$2.class
	Vegeta/bin/classes/com/example/vegeta/Ingrediente.class
	Vegeta/bin/classes/com/example/vegeta/Inicioconlogin$3.class
	Vegeta/bin/classes/com/example/vegeta/ItemIngredQueryAdapter.class
	Vegeta/bin/classes/com/example/vegeta/ListViewAdapter.class
	Vegeta/bin/classes/com/example/vegeta/LoginSignUpActivity$1$1.class
	Vegeta/bin/classes/com/example/vegeta/LoginSignUpActivity$2$1.class
	Vegeta/bin/classes/com/example/vegeta/LoginSignUpActivity$2.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$1.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$2$1.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$2$2.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$2$3.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$2$4.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$2$5.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$2.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$3$1.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$3$2.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$3$3.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$3.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity$RemoteDataTask.class
	Vegeta/bin/classes/com/example/vegeta/MainActivity.class
	Vegeta/bin/classes/com/example/vegeta/Modificar$1.class
	Vegeta/bin/classes/com/example/vegeta/ModificarIngrediente$1.class
	Vegeta/bin/classes/com/example/vegeta/ModificarIngrediente$3.class
	Vegeta/bin/classes/com/example/vegeta/ModificarIngrediente.class
	Vegeta/bin/classes/com/example/vegeta/R$styleable.class
	Vegeta/bin/classes/com/example/vegeta/Result1$2$1.class
	Vegeta/bin/classes/com/example/vegeta/ResultIngrediente1$2$1.class
	Vegeta/bin/classes/com/google/android/gms/R$styleable.class
	Vegeta/project.properties
	appcompat_v7/bin/appcompat_v7.jar
Merge branch 'master' of https://github.com/bravo99/zeron
parte lopez