initial commit 2

README.md

@@ -1,3 +1,23 @@
+<<<<<<< HEAD
 # ProxyTrash
 
-Una aplicacion para saber si el camion mas sercano es Organico o inorganico junto con su distancia y otras funciones mas.
+Una aplicacion para saber si el camion mas sercano es Organico o inorganico junto con su distancia y otras funciones mas.
+=======
+# flutter_application_1
+
+A new Flutter project.
+
+## Getting Started
+
+This project is a starting point for a Flutter application.
+
+A few resources to get you started if this is your first Flutter project:
+
+- [Learn Flutter](https://docs.flutter.dev/get-started/learn-flutter)
+- [Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+- [Flutter learning resources](https://docs.flutter.dev/reference/learning-resources)
+
+For help getting started with Flutter development, view the
+[online documentation](https://docs.flutter.dev/), which offers tutorials,
+samples, guidance on mobile development, and a full API reference.
+>>>>>>> 8e51b9c (initial commit 2)