AdrixSC · abigail1993 · Apr 3, 2018 · Apr 16, 2018
diff --git a/assets/images/carrito.png b/assets/images/carrito.png
diff --git a/assets/images/eco-1.png b/assets/images/eco-1.png
diff --git a/assets/images/ecommerce -2.png b/assets/images/ecommerce -2.png
diff --git a/assets/images/ecommerce -3.png b/assets/images/ecommerce -3.png
diff --git a/assets/images/ecommerce -4.png b/assets/images/ecommerce -4.png
diff --git a/assets/images/ecommerce -all.png b/assets/images/ecommerce -all.png
diff --git a/assets/images/ecommerce.png b/assets/images/ecommerce.png
diff --git a/assets/images/filtro.png b/assets/images/filtro.png
diff --git a/readme.md b/readme.md
@@ -3,6 +3,19 @@
 Descripción: Consumir API para obtener productos de venta en línea y hacer un ecommerce, y poder hacer el pago mediante alguna otra API.
 Para este proyecto se consumieron las API´s de Mercado Libre, Paypal y Firebase para el login.
 
+<<<<<<< HEAD
+Para su desarrollo se utilizo las Api´s de Mercado Libre, PayPal y Firebase.
+
+
+![Vista principal](assets/images/eco-1.png)
+
+![Busqueda especifica](assets/images/filtro.png)
+
+![Informacion por producto](assets/images/carrito.png)
+
+Desarrolada para Laboratoria.
+=======
 ![eco-shop](https://user-images.githubusercontent.com/32860516/38168586-d604aeb8-350d-11e8-9fa7-2ad7500ed31b.png)
 
-Desarrollado para Laboratoria (http://laboratoria.la)
+Desarrollado para Laboratoria (http://laboratoria.la)
+>>>>>>> upstream/master