diff --git a/.gitattributes b/.gitattributes
index 6f2c478b..1ff0c423 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,11 +1,8 @@
 ###############################################################################
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
-
 * text=auto
 
-*.* linguist-language=C
-
 ###############################################################################
 # Set default behavior for command prompt diff.
 #
diff --git a/.github/ISSUE_TEMPLATE/reporte-de-error--bug-report-.md b/.github/ISSUE_TEMPLATE/reporte-de-error--bug-report-.md
new file mode 100644
index 00000000..6c070b7b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/reporte-de-error--bug-report-.md
@@ -0,0 +1,35 @@
+---
+name: Reporte de Error (Bug report)
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!-- ⚠️⚠️  !No borrar éste encabezado! Plantilla de Reporte-de-Error ⚠️⚠️ -->
+<!-- Por favor, buscar antes si éste error ya fue publicado por otro usuario para evitar duplicaciones. -->
+<!-- Además, pruebe con la última versión de Latino para asegurar que su problema no fue solucionado ya -->
+
+<!-- Descripción del error-->
+De una breve descripción del error que le ocurre.
+
+
+
+<!-- Captura de Pantalla -->
+Si aplica, proporcione una captura de pantalla del error que le ocurre.
+
+<!-- Información del Ordenador (por favor, complete las siguientes casillas): -->
+ - OS: [e.g. Windows 10]
+ - Versión de Latino [e.g. 1.0.0]
+
+<!-- Información Adicional -->
+Agregue cualquier otra información adicional sobre su problema.
+
+<!-- Código donde el error ocurre -->
+Si aplica, proporcione  el fragmento de código del cual Latino hace error
+
+```c
+// pegar su código aquí
+
+```
diff --git a/.github/ISSUE_TEMPLATE/solicitud-de-caracter-stica--feature-request-.md b/.github/ISSUE_TEMPLATE/solicitud-de-caracter-stica--feature-request-.md
new file mode 100644
index 00000000..545f1794
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/solicitud-de-caracter-stica--feature-request-.md
@@ -0,0 +1,24 @@
+---
+name: Solicitud de Característica (Feature request)
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+<!-- ⚠️⚠️  !No borrar éste encabezado! Plantilla de Reporte-de-Característica⚠️⚠️ -->
+<!-- Por favor, buscar antes si esta solicitud ya fue publicado por otro usuario para evitar duplicaciones. -->
+<!-- Además, pruebe con la última versión de Latino para asegurar que su solicitud ya fue añadida -->
+
+<!-- ¿Su solicitud de característica acaso resuelve algún problema? Por favor, descríbalo -->
+De una breve descripción de su solicitud de característica. Eje.: Siempre me siento frustrado con...[]
+
+<!-- Describa el tipo de solución que le gustaría que se implementara -->
+De una breve descripción de lo que quiere que suceda cuando se use esa característica.
+
+<!-- Describa cualquier alternativas que usted considere  -->
+De una breve descripción de cualquier alternativa a su solicitud que usted considera apropiada.
+
+<!-- Información Adicional -->
+Agregue cualquier otra información adicional sobre su solicitud.
diff --git a/.gitignore b/.gitignore
index 5320a97f..a45a58c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ Testing/
 codeblocks/
 codelite/
 mingw/
+visualstudio/
 .vagrant/
 .codelite/
 .clang/
@@ -42,4 +43,4 @@ compile_commands.json
 compiling_error.txt
 <scratch>
 src/latino
-src/liblatino.so
+src/liblatino.so
\ No newline at end of file
diff --git a/.readme/instalacion_mac.md b/.readme/instalacion_mac.md
index 28f85dfc..1cb88dd5 100644
--- a/.readme/instalacion_mac.md
+++ b/.readme/instalacion_mac.md
@@ -19,6 +19,18 @@ en caso de no tenerlo instalado lo podemos descargar [desde aquí](https://devel
 (Necesitaremos una cuenta en Apple para poder acceder a la lista de descargas)
     - Una vez lo tengamos instalado desde la misma página procedemos a descargar e instalar **Xcode Command Tool**
 
+# Desinstalar Latino
+Para desinstalar Latino procedemos con los siguientes pasos:
+1. Doble-clic en nuestro paquete de instalación Latino-XXX-Darwin.pkg.
+2. Una vez nuestra imagen sea montada en nuestro escritorio hacemos doble-clic para abrir.
+3. Doble-clic en la carpeta llamada **Extras**.
+4. Abrimos nuestra Terminal en Mac.
+5. Escribimos **sudo sh** (le dejamos un espacio al final).
+6. Agaramos y soltamos nuestro archivo **uninstall.sh** en nuestra Terminal.<br/>
+    Ejemplo:<br/>
+	    **$ sudo sh /Volumes/Latino-XXX-Darwin/Extras/uninstall.sh**
+7. Presionamos **Enter** para correr el comando y procedemos con insertar nuestra contraseña de administrador.
+
 # Ayuda y Documentación:
 [Foro de Latino para Mac](http://lenguaje-latino.org/foro/mac/)<br/>
 [Manual Latino](http://manual.lenguaje-latino.org/)
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index 2da800d0..068eba9b 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -2,8 +2,9 @@
   "ExpandedNodes": [
     "",
     "\\.readme",
-    "\\.readme\\imgs"
+    "\\.readme\\imgs",
+    "\\include"
   ],
-  "SelectedNode": "\\README.md",
+  "SelectedNode": "\\include\\latino.h",
   "PreviewInSolutionExplorer": false
 }
\ No newline at end of file
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index bad96fe6..b0d03a46 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -11,10 +11,10 @@
                 "_UNICODE"
             ],
             "windowsSdkVersion": "10.0.17763.0",
-            "compilerPath": "/usr/bin/gcc",
+            "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.21.27702/bin/Hostx64/x64/cl.exe",
             "cStandard": "c11",
             "cppStandard": "c++17",
-            "intelliSenseMode": "gcc-x64",
+            "intelliSenseMode": "msvc-x64",
             "compileCommands": "${workspaceFolder}/compile_commands.json"
         }
     ],
diff --git a/InnoSetup/latino.iss b/InnoSetup/latino.iss
index 34f1a895..c07046d7 100644
--- a/InnoSetup/latino.iss
+++ b/InnoSetup/latino.iss
@@ -1,11 +1,12 @@
-; Script generated by the Inno Setup Script Wizard.
+; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Latino"
-#define MyAppVersion "1.1.0"
-#define MyAppPublisher "Lenguaje Latino"
+#define MyAppVersion "1.2.0"
+#define MyAppPublisher "Lenguaje-Latino.org"
 #define MyAppURL "http://lenguaje-latino.org/"
-#define MyAppManual "https://manuallatino.blogspot.com"
+#define MyAppSupURL "http://manuallatino.blogspot.com"
+#define MyAppUpURL "https://github.com/lenguaje-latino/latino"
 #define MyAppExeName "latino.exe"
 
 [Setup]
@@ -15,16 +16,18 @@
 AppId={{887BAB8B-D5EC-4D62-8224-DC99F3629CB4}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
+AppVerName={#MyAppName}-{#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppManual}
-AppUpdatesURL={#MyAppURL}
+AppSupportURL={#MyAppSupURL}
+AppUpdatesURL={#MyAppUpURL}
+AppComments=Lenguaje de Programacion Latino
+AppCopyright=copyleft (ɔ) 2020 {#MyAppName} {#MyAppPublisher}
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
 LicenseFile="..\LICENSE.txt"
 OutputDir="..\InnoSetup"
-OutputBaseFilename=setup
+OutputBaseFilename={#MyAppName}-{#MyAppVersion}-Win
 SetupIconFile="..\InnoSetup\bin\latino.ico"
 Compression=lzma
 SolidCompression=yes
@@ -42,9 +45,9 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "..\InnoSetup\bin\*"; DestDir: "{app}\bin\"; Flags: ignoreversion
 Source: "..\InnoSetup\lib\*"; DestDir: "{app}\lib\"; Flags: ignoreversion
-Source: "..\build\src\Release\*"; DestDir: "{app}\bin\"; Flags: ignoreversion
-Source: "..\build\src\regex-2.7-src\src\Release\*"; DestDir: "{app}\lib\"; Flags: ignoreversion
-Source: "..\build\src\linenoise\Release\*"; DestDir: "{app}\lib\"; Flags: ignoreversion
+Source: "..\visualstudio\src\Debug\*"; DestDir: "{app}\bin\"; Flags: ignoreversion
+Source: "..\visualstudio\src\regex-2.7-src\src\Debug\*"; DestDir: "{app}\lib\"; Flags: ignoreversion
+Source: "..\visualstudio\src\linenoise\Debug\*"; DestDir: "{app}\lib\"; Flags: ignoreversion
 Source: "..\include\*.h"; DestDir: "{app}\include\"; Flags: ignoreversion
 ;Source: "..\ejemplos\*"; DestDir: "{app}\ejemplos\"; Flags: ignoreversion recursesubdirs createallsubdirs
 
diff --git a/README.md b/README.md
index 6bfa8521..cae347bc 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
     </a>
 </p>
 
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/Lenguaje-Latino/Latino)
 [![https://t.me/joinchat/EBHu7z6l6_paWtcJgu9DVQ](https://img.shields.io/badge/Soporte-Telegram-green.svg?style=plastic)](https://t.me/joinchat/AAAAAD6l6_qIgQAAgu9DVQ)
 [![Join the chat at https://gitter.im/primitivorm/latino](https://badges.gitter.im/primitivorm/latino.svg)](https://gitter.im/primitivorm/latino?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -11,7 +12,6 @@
 <a href="http://lenguaje-latino.org"><img src="https://img.shields.io/npm/l/vue.svg" alt="License"></a>
 [![codecov.io](http://codecov.io/github/primitivorm/latino/coverage.svg?branch=master)](http://codecov.io/github/primitivorm/latino?branch=master)
 
-<<<<<<< HEAD
 <a name="tabla"></a>
 # Tabla de contenidos
 * [Tabla de contenidos](#tabla)
@@ -46,7 +46,7 @@
 
 <a name="intro"></a>
 ### Vídeo introductorio de Latino (clic en la imagen)
-[![Watch the video](https://raw.githubusercontent.com/MelvinG24/Latino/master/.readme/imgs/latinoVideo.bmp)](https://youtu.be/ljQKPihnejU)
+[![Video Introductorio de Latino](https://j.gifs.com/GvrEK0.gif)](https://youtu.be/ljQKPihnejU)
 
 <a name="porQue"></a>
 # ¿Por qué usar Latino?
@@ -79,6 +79,7 @@
 - [Chat en Gitter](https://gitter.im/primitivorm/latino?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 - [Chat en Telegram](https://t.me/joinchat/AAAAAD6l6_qIgQAAgu9DVQ)
 - [Manual Latino](https://manuallatino.blogspot.com)
+- [API de Latino](https://manuallatinoapi.blogspot.com)
 
 <a name="sintx"></a>
 # SINTAXIS DE LATINO
@@ -89,68 +90,9 @@ Los comentarios de una linea empezaran por el signo de gato `#` (como en python)
 ```js
 #Este es un comentario estilo python
 //Este es un comentario estilo C
-=======
-¿Qué es lenguaje Latino?
-===
-
-`Latino` es un lenguaje de programación creado en [C](https://es.wikipedia.org/wiki/C_(lenguaje_de_programaci%C3%B3n)), inspirado en [Lua](https://www.lua.org/) y [Python](https://www.python.org), este proyecto nace de la necesidad de incrementar la educación de nivel básico y avanzado para que niños, adolescentes y adultos también se motiven a entrar en el mundo de la programación y desarrollar aplicaciones en la sintaxis de su idioma,   `Latino` es también para desarrolladores ya que `Latino` es completamente funcional con cualquier [API](https://es.m.wikipedia.org/wiki/Interfaz_de_programaci%C3%B3n_de_aplicaciones) REST, y puedes crear tu propia librería de Latino.
-
-<a href="http://www.youtube.com/watch?feature=player_embedded&v=ljQKPihnejU&t=1s" target="_blank">
-<img src="https://i.ytimg.com/vi/ljQKPihnejU/2.jpg" alt="Ver introducción" width="320px" height="240px" border="10" />
-</a>
-
-A continuación menciono las principales características de este proyecto:
-
-1. __Simplicidad:__ La sintaxis deberá de ser lo más parecido posible al lenguaje español.
-2. __Sencillo de aprender:__ Al ser simple aprenderás más rápido éste nuevo lenguaje.
-3. __Código abierto:__ Cualquiera puede descargar el código fuente del lenguaje, extender las librerías básicas y crear sus propias librerías si así lo desea.
-4. __Lenguaje de alto nível:__ Cuando escribas código no tendrás que preocuparte por detalles de bajo nivel, como manejar la memoria empleada en tu programa, `Latino` asignará la memoria adecuada e inmediatamente liberará esa memoria cuando ya no sea necesaria.
-5. __Portable:__ Cuando escribas tus programas en `Latino` podrás ejecutarlo en cualquier plataforma de manera segura y fácil.
-6. __Programación Procedural, Funcional y Orientado a Objetos.__
-
-<a href="https://github.com/lenguaje-latino/latino-sublimetext-plugin" target="_blank">
-<img src ="https://raw.githubusercontent.com/lenguaje-latino/latino-sublimetext-plugin/master/latino_sublime.png" />
-</a>
-
-## INSTALAR
-
-[Windows](doc/instalacion_windows.md)
-
-[Debian/Ubuntu](doc/instalacion_debian.md)
-
-[Fedora](doc/instalacion_fedora.md)
-
-[Mac](doc/instalacion_mac.md)
-
-[Plugins](https://github.com/lenguaje-latino)
-
-## [Manual Latino](https://manuallatino.blogspot.com)
-
-
-DEFINICIÓN (lenguaje latino)
-===
-
-A continuación se explica de manera general la definición del lenguaje de programación `Latino`
-
-Comentarios:
----
-Los comentarios de una linea empezaran por el signo de gato `#` (como en python ) o `//` (como en C).
-
-```Python
-# Este es un comentario estilo python
-```
-
-```C
-// Este es un comentario estilo C
->>>>>>> master
 ```
 Los comentarios multilínea son al estilo C. inician con `/*` y terminan con `*/`.
-<<<<<<< HEAD
 ```c
-=======
-
-```C
->>>>>>> master
 /*
 Este es un
 comentario
@@ -160,7 +102,6 @@ multilínea
 <a name="var"></a>
 ## II. Variables:
 Las variables son identificadores asociados a valores.
-<<<<<<< HEAD
 ```python
 nombre = "Juan Perez"
 calificacion = 10
@@ -173,33 +114,13 @@ Es posible asignar más de una variable en una sola línea de código
 a, b, c = 1, 2, 3   #a = 1  b = 2  c = 3
 a, b, c = 1, 2      #a = 1  b = 2  c = nulo
 a, b    = 1, 2, 3   #a = 1  b = 2  se descarta el valor 3
-=======
-
-```C
-nombre = "Juan Perez"
-calificacion = 10
-numeros = [1, 2, 3, 4, 5]  // Esto es una lista o arreglo.
-sueldos = { "Jesus" : 10000, "Maria" : 20000, "Jose" : 30000 } // Esto es un diccionario
-```
-
-Es posible asignar más de una variable en una sola línea de código
-```C
-a, b, c = 1, 2, 3   // a = 1  b = 2  c = 3
-a, b, c = 1, 2      // a = 1  b = 2  c = nulo
-a, b    = 1, 2, 3   // a = 1  b = 2  se descarta el valor 3
->>>>>>> master
 ```
 <a name="puede"></a>
 ### __Un identificador puede:__
 1. Empezar por guión bajo `_` o letras `a-z ó A-Z`. No son validas las letras acentuadas ni la `ñ` como letras en los identificadores.
 2. Contener caracteres en mayúsculas y minúsculas.
 Latino  es sensible a mayúsculas y minúsculas. Por lo que los siguientes identificadores no son los mismos.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 mensaje = "Hola mundo"
 Mensaje = "¡Hasta la vista baby!"
 ```
@@ -212,14 +133,8 @@ Mensaje = "¡Hasta la vista baby!"
 ## III. Constantes:
 Cuando se declara una constante, también se debe asignar el valor forzosamente.
 
-<<<<<<< HEAD
 Las constantes se deben declarar en **mayúsculas**.
 ```python
-=======
-Las constantes se deben declarar en mayúsculas.
-
-```C
->>>>>>> master
 PI = 3.14159
 G = 9.8
 ```
@@ -251,16 +166,11 @@ A continuación se listan los operadores:
 La precedencia de operadores es la misma que otros lenguajes de programación como C / Python / Lua.
 
 El operador ternario se puede usar para asignar valores basado en una condición, los paréntesis son requeridos para obtener el resultado esperado.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 numero = -5
 mensaje = (numero < 0) ? " es negativo" : " es positivo"
 escribir("El número " .. numero .. mensaje)
-// Salida: El número -5 es negativo
+#salida: El número -5 es negativo
 ```
 <a name="estrCtrl"></a>
 ## VI. Estructuras de control:
@@ -268,77 +178,57 @@ escribir("El número " .. numero .. mensaje)
 ### si (if)
 Evalua una condición y si el resultado es `verdadero` ejecuta
 las instrucciones a continuación. Los paréntesis son opcionales en la condición.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 si (condicion)
-   // Código
+   #codigo
 fin
 
 edad = 18
 si edad >= 18
     escribir("Eres mayor de edad, ya puedes votar.")
 fin
-// Salida: Eres mayor de edad, ya puedes votar.
+#salida: Eres mayor de edad, ya puedes votar.
 ```
 
 En caso de que el resultado de la condición sea `falso` se deberá de ejecutar el código después de la palabra reservada `sino`.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 si condicion
-   // Código
+   #codigo
 sino
-   // Código
+   #codigo
 fin
 
 edad = 5
 si edad >= 18
-    escribir("Eres mayor de edad, ya alcanzas el timbre, ya puedes votar.")
+    escribir("Eres mayor de edad, ya puedes votar.")
 sino
     escribir("Eres un niño, tienes que ir a la escuela.")
 fin
-// Salida: Eres mayor de edad, ya alcanzas el timbre, ya puedes votar. O: Eres un niño, tienes que ir a la escuela.
+#salida: Eres un niño, tienes que ir a la escuela.
 ```
 
 Es posible el anidamiento de las sentencias `si-sino` de la siguiente manera:
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 si condicion
-   // Código
+   #codigo
 sino
     si condicion
-        // Código
+        #codigo
     sino
-        // Código
+        #codigo
     fin
 fin
 ```
 Existe una forma más elegante de escribir el código anterior con la palabra reservada `osi`. En python es `elif expresion:`.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 si condicion1
-    // Código
+    #codigo
 osi condicion2
-    // Código
+    #codigo
 osi condicion3
-    // Código
+    #codigo
 sino
-    // Código
+    #codigo
 fin
 ```
 ---
@@ -347,21 +237,16 @@ fin
 Evalúa una opción de múltiples posibles casos.
 La opción puede ser una expresión, en caso de que ninguna opción se cumpla en algún caso se ejecuta el código después de la palabra reservada `otro` o `defecto`.
 Los valores de los casos solo pueden ser numéricos o cadenas.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 elegir (opcion)
     caso valor1:
-        // Código
+        #codigo
     caso valor2:
-        // Código
+        #codigo
     caso valor3:
-        // Código
+        #codigo
     defecto:
-        // Código
+        #codigo
 fin
 
 calificacion = 'B'
@@ -379,7 +264,7 @@ elegir(calificacion)
     otro:
         escribir("Calificación invalida.")
 fin
-// Salida: Bien echo!
+#salida: Bien echo!
 ```
 Notese que se tiene que repetir el caso para `B` y `C` por el momento no se permiten casos múltiples como una sola opción.
 
@@ -388,61 +273,45 @@ Notese que se tiene que repetir el caso para `B` y `C` por el momento no se perm
 ### desde (for loop)
 Hace que una instrucción o bloque de instrucciones se repitan
 desde una condición inicial y mientras la condición se cumpla (es decir sea `verdadero`), en esta sentencia los paréntesis si son requeridos.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 desde (condicion_inicial; condicion; incremento)
-     // Código
+     #codigo
 fin
 
 desde (i=0; i <= 10; i++)
      escribir(i)
 fin
-// Salida: 0 1 2 3 4 5 6 7 8 9 10
+#salida: 0 1 2 3 4 5 6 7 8 9 10
 
 desde (i=10; i >= 0; i--)
      escribir(i)
 fin
-// Salida: 10 9 8 7 6 5 4 3 2 1 0
+#salida: 10 9 8 7 6 5 4 3 2 1 0
 ```
 
 Se puede especificar un salto diferente cambiando la expresión de incremento.
-<<<<<<< HEAD
 ```python
 desde(i=0; i < 50; i=i+10)
-=======
-
-```C
-desde (i=0; i < 50; i=i+10)
->>>>>>> master
     imprimir(i)
 fin
-// Salida: 0 10 20 30 40
+#salida: 0 10 20 30 40
 ```
 ---
 <a name="mientras"></a>
 ### mientras (do while)
 Hace que una instrucción o bloque de instrucciones se repitan
 mientras la condición sea `verdadero`, los paréntesis son opcionales en la condición.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 mientras (condicion)
-    // Código
+    #codigo
 fin
 
 i=0
 mientras i < 10
     escribir(i)
-    i++ // Incrementa el valor de i (suma 1 a i)
+    i++ #incremento
 fin
-// Salida: 0 1 2 3 4 5 6 7 8 9
+#salida: 0 1 2 3 4 5 6 7 8 9
 ```
 ---
 <a name="rept"></a>
@@ -451,39 +320,28 @@ Hace que una instrucción o bloque de instrucciones
 se repitan mientra la condición sea `falso`,
 las instrucciones de código se ejecutan al menos una vez.
 Los paréntesis son opcionales en la condición.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 repetir
-    // Código
-hasta (condicion)
+    #codigo
+hasta condicion
 
 i=0
 repetir
     escribir(i)
-    i++ // Incrementa el valor de i (suma 1 a i)
+    i++ #incremento
 hasta i == 10
-// Salida: 0 1 2 3 4 5 6 7 8 9
+#salida: 0 1 2 3 4 5 6 7 8 9
 ```
 
 Se puede salir de los bucles (`desde`, `mientras` y `repetir`) con la palabra reservada `romper`.
-<<<<<<< HEAD
 ```python
 desde(i=0; i < 10; i++)
-=======
-
-```C
-desde (i=0; i < 10; i++)
->>>>>>> master
     si (i == 5)        
-        romper    // Se sale del ciclo desde
+        romper    #se sale del ciclo desde
     fin
     imprimir(i)
 fin
-// Salida: 0 1 2 3 4, se imprime sólo hasta el 4
+#salida: 0 1 2 3 4   #se imprime solo hasta el 4
 ```
 <a name="fun"></a>
 ## VII. Funciones
@@ -493,70 +351,52 @@ Las funciones se definen con la palabra reservada `funcion` o la forma corta `fu
 
 Se puede regresar el valor con la palabra clave `regresar`, `retornar` o la forma corta `ret`.
 La estructura de una función es la siguiente:
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 funcion nombreFuncion (argumento1, argumento2)
-    // Código
+    #codigo
     retornar resultado
 fin
 
-// La siguiente función suma dos números
+#La siguiente función suma dos números
 fun sumar(a, b)
   ret a + b
 fin
 ```
 
 Para invocar (ejecutar) una función se hace con el nombre de la función y la lista de parámetros entre paréntesis.
-<<<<<<< HEAD
 ```python
 r = sumar(2, 3)  #se almacena el resultado en la variable r
-=======
-
-```C
-r = sumar(2, 3)  // Se almacena el resultado en la variable r
->>>>>>> master
 escribir(r)
-// Salida: 5
+#salida: 5
 ```
 
 Se pueden crear funciones con un número variable de argumentos con `...` en el ultimo parámetro de la definición.
-<<<<<<< HEAD
 ```python
-=======
-
-```C
->>>>>>> master
 funcion varArgs(arg1, arg2, ...)
-  va = [...] // Se obtienen los parametros 3 en adelante como una lista y se asignan a la variable va
-  escribir("parámetro 1: " .. arg1) // Imprime el parámetro 1
-  escribir("parámetro 2: " .. arg2) // Imprime el parámetro 2
-  escribir("parámetro 3: " .. va[0]) // Imprime el parámetro 3
+  va = [...] #se obtienen los parametros 3 en adelante como una lista y se asignan a la variable va
+  escribir("parametro 1: " .. arg1) #imprime el parametro 1
+  escribir("parametro 2: " .. arg2) #imprime el parametro 2
+  escribir("parametro 3: " .. va[0]) #imprime el parametro 3
   retornar arg1 + arg2
 fin
 
-// Llamada a función varArgs con 2 elementos
+#llamada a función varArgs con 2 elementos
 r = varArgs(1, 2)
 escribir(r)
-/* Salida:
-** parametro 1: 1
-** parametro 2: 2
-** parametro 3: nulo
-** 3
-*/
+#salida:
+parametro 1: 1
+parametro 2: 2
+parametro 3: nulo
+3
 
-// Llamada a funcion varArgs con 3 elementos
+#llamada a funcion varArgs con 3 elementos
 r = varArgs(1, 2, 3)
 escribir(r)
-/* Salida:
-** parametro 1: 1
-** parametro 2: 2
-** parametro 3: 3
-** 3
-*/
+#salida:
+parametro 1: 1
+parametro 2: 2
+parametro 3: 3
+3
 ```
 <a name="lista"></a>
 ## VIII. Listas
@@ -565,67 +405,40 @@ Una lista es un tipo de colección. Es equivalente a lo que en otros lenguajes s
 Las listas pueden contener cualquier tipo de dato: lógico, númerico, literal, cadena, listas, diccionarios.
 
 Crear una lista es tan sencillo como indicar entre corchetes y separados por comas los valores que queremos incluir en la lista.
-<<<<<<< HEAD
 ```python
 #declaracion de listas
-=======
-```C
-// Declaracion de listas
->>>>>>> master
 numeros = [1, 2, 3, 4, 5]
 vacia = []
 ```
 
 Podemos acceder a cada uno de los elementos de la lista escribiendo el nombre de la lista e indicando el índice del elemento entre corchetes `[]`.
 Ten en cuenta que el índice del primer elemento de la lista es 0:
-<<<<<<< HEAD
 ```python
-=======
-```C
->>>>>>> master
 escribir(numeros[1])
-// Salida: 2
+#salida: 2
 ```
 
 También podemos utilizar este operador para modificar un elemento de la lista si lo
 colocamos en la parte izquierda de una asignación:
-<<<<<<< HEAD
 ```python
-=======
-```C
->>>>>>> master
 numeros[0] = 99
 escribir(numeros)
-// Salida: [99, 2, 3, 4, 5]
+#salida: [99, 2, 3, 4, 5]
 ```
 
 Podemos utilizar también números negativos. Si se utiliza un número negativo como índice, esto se traduce en que el índice empieza a contar desde el final, hacia la izquierda; es decir, con [-1] accederíamos al último elemento de la lista, con [-2] al penúltimo, con [-3], al antepenúltimo, y así sucesivamente.
-<<<<<<< HEAD
 ```python
-=======
-```C
->>>>>>> master
 escribir(numeros[-1])
-// Salida: 5
+#salida: 5
 ```
 <a name="dic"></a>
 ## IX. Diccionarios
 Los diccionarios, también llamados matrices asociativas, deben su nombre a que son colecciones que relacionan una clave y un valor, entre llaves y separado el valor de la clave con dos puntos.
-<<<<<<< HEAD
 ```python
 #Diccionario de personajes y actores:
 actores = { "Chilindrina": "Maria Antonieta de las Nieves",
      "El chavo del 8": "Roberto Gomez Bolaños",
      "Tres patines": "Leopoldo Fernandez" }
-=======
-```C
-// Diccionario de personajes y actores:
-actores = {
-	"Chilindrina": "Maria Antonieta de las Nieves",
-	"El chavo del 8": "Roberto Gomez Bolaños",
-	"Tres patines": "Leopoldo Fernandez"
-}
->>>>>>> master
 ```
 
 El primer valor se trata de la clave y el segundo del valor asociado a la clave.
@@ -636,24 +449,16 @@ Si se modificara el objeto clave después de haber sido introducido en el diccio
 su hash también cambiaría y no podría ser encontrado.
 
 La diferencia principal entre los diccionarios y las listas es que a los valores almacenados en un diccionario se les accede no por su índice, porque de hecho no tienen orden, sino por su clave, utilizando corchetes `[]`.
-<<<<<<< HEAD
 ```python
-=======
-```C
->>>>>>> master
 escribir(actores["Chilindrina"])
-// Salida: Maria Antonieta de las Nieves
+#salida: Maria Antonieta de las Nieves
 ```
 
 Al igual que en listas también se puede utilizar corchetes para reasignar valores.
-<<<<<<< HEAD
 ```python
-=======
-```C
->>>>>>> master
 actores["Chilindrina"] = "Maria Antonieta"
 escribir(actores["Chilindrina"])
-// Salida: Maria Antonieta
+#salida: Maria Antonieta
 ```
 <a name="plbrsRvds"></a>
 ## X. Palabras reservadas hasta el momento
diff --git a/_config.yml b/_config.yml
new file mode 100644
index 00000000..b8497135
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-leap-day
\ No newline at end of file
diff --git a/bin/debug.lat b/bin/debug.lat
index c560d371..c4b2f575 100644
--- a/bin/debug.lat
+++ b/bin/debug.lat
@@ -1,5 +1,93 @@
-i=0
-mientras(i < 1000000)
-    poner(i)
-    i++
-fin
\ No newline at end of file
+funcion fibo_iter(n)
+    si ( n < 2 )
+        retorno n
+    fin
+    prevPrev = 0
+    prev = 1
+    res = 0
+    i = 2
+    mientras( i <= n)
+        res = prev + prevPrev
+        prevPrev = prev
+        prev = res
+        i = i + 1
+    fin
+    retorno res
+fin
+res = "fibo_iter: "
+res ..= fibo_iter(8)
+poner(res)
+/*
+funcion fibo_rec(n)
+    si ( n < 2 )
+        retorno n
+    fin
+    retorno fibo_rec(n-1) + fibo_rec(n-2)
+fin
+
+poner(fibo_rec(6))
+
+
+fun fret (a, b)
+  ret a+b
+fin
+fun fnoret(a,b)
+  x=a+b
+fin
+fun fmultiret(a,b)
+  ret a, b
+fin
+//fret(1,2)   //LOAD_CONST      1
+//val = fret(1,2)   //ADJUST_STACK      1 -> STORE_NAME val
+//val1, val2 = fret(1,2)  //ADJUST_STACK    2 ->  STORE_NAME val2 -> STORE_NAME val1
+//poner(val1)
+//poner(val2)
+fmultiret(1,2)
+poner(fmultiret(1,2))
+poner(fnoret(1,2))   //aqui regresa el 3 <-resultado de fret
+poner(fnoret(1,2))   //aqui manda error porque no hay valores en la pila
+*/
+/*
+//una funcion varargs se crea con ... en su ultimo parametro
+funcion mi_concatenar(arg1, arg2, ...)
+    //obtenemos los parametros varargs
+    args = [...]
+    //concatenamos los primeros 2 argumentos
+    r= arg1 .. arg2
+    desde (i=0; i < args; i++)
+        r = r .. args[i]
+    fin
+    retornar r
+fin
+//enviamos N parametros
+msg = mi_concatenar("hola ", "mundo ", "este ", "es ", "un ", "mensaje ", "largo...")
+escribir(msg)   //imprime: "hola mundo este es un mensaje largo..."
+
+//otro ejemplo
+funcion sumar(...)
+    args = [...]
+    r=0
+    desde (i=0; i < args; i++)
+        r = r + args[i]
+    fin
+    retornar r
+fin
+x = sumar(1,2,3,4,5)
+imprimir(x)     //imprime: "15"
+
+//una funcion multi-retorno es aquella que regresa N parametros
+funcion multi_retorno(msg)
+    #proceso el mensaje
+    //mas codigo
+    //regreso un valor exitoso y un mensaje, puede retornar mas mensajes
+    retornar verdadero, "el mensaje se envio correctamente"
+fin
+
+//asignacion multiple de variables
+correcto, mensaje = multi_retorno("hola amigos")
+
+si correcto
+    //imprime: "el mensaje se envio correctamente"
+    escribir(mensaje)
+fin
+*/
diff --git a/include/latcompat.h b/include/latcompat.h
index f50e3dc7..3216b5e3 100644
--- a/include/latcompat.h
+++ b/include/latcompat.h
@@ -27,6 +27,7 @@ THE SOFTWARE.
 
 /** Determina el sistema operativo*/
 #if (defined __WIN32__) || (defined _WIN32)
+#define SISTEMAOPERATIVO "WIN32"
 #define LATINO_BUILD_AS_DLL
 #define PATH_SEP "\\"
 #define LAT_FUNC extern
@@ -53,6 +54,7 @@ THE SOFTWARE.
 //#include "TargetConditionals.h"
 //#include <GLUT/glut.h>
 //#include <OpenGL/OpenGL.h>
+#define SISTEMAOPERATIVO "APPLE"
 #include <dlfcn.h>
 #include <readline/history.h>
 #include <readline/readline.h>
@@ -72,6 +74,7 @@ THE SOFTWARE.
 /* --EndsMacOS-- */
 
 #ifdef __linux__
+#define SISTEMAOPERATIVO "LINUX"
 #include <dlfcn.h>
 #include <readline/history.h>
 #include <readline/readline.h>
diff --git a/include/latino.h b/include/latino.h
index f8f32c5d..7f850e85 100644
--- a/include/latino.h
+++ b/include/latino.h
@@ -60,7 +60,7 @@ THE SOFTWARE.
 /** Version mayor de Latino */
 #define LAT_VERSION_MAYOR "1"
 /** Version menor de Latino */
-#define LAT_VERSION_MENOR "1"
+#define LAT_VERSION_MENOR "2"
 /** Version de correcion de errores */
 #define LAT_VERSION_PARCHE "0"
 /** Version de Latino */
@@ -69,7 +69,7 @@ THE SOFTWARE.
 /** Derechos de Latino */
 #define LAT_DERECHOS                                                           \
     LAT_VERSION                                                                \
-    "\nTodos los derechos reservados (C) 2015-2019. Latinoamerica"
+    "\nTodos los derechos reservados (C) 2015-2020. Latinoamerica"
 
 #define LAT_ERRMEM 1
 #define LAT_ERRRUN 2
diff --git a/paquetes/MacOS/.DS_Store b/paquetes/MacOS/.DS_Store
new file mode 100644
index 00000000..11945907
Binary files /dev/null and b/paquetes/MacOS/.DS_Store differ
diff --git a/paquetes/MacOS/Extras/.DS_Store b/paquetes/MacOS/Extras/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/paquetes/MacOS/Extras/.DS_Store differ
diff --git a/paquetes/MacOS/Extras/en/.DS_Store b/paquetes/MacOS/Extras/en/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/paquetes/MacOS/Extras/en/.DS_Store differ
diff --git a/paquetes/MacOS/Extras/en/Read Before You Install Packages.rtf b/paquetes/MacOS/Extras/en/Read Before You Install Packages.rtf
new file mode 100644
index 00000000..d343d4a9
--- /dev/null
+++ b/paquetes/MacOS/Extras/en/Read Before You Install Packages.rtf	
@@ -0,0 +1,118 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\froman\fcharset0 Times-Roman;\f2\fmodern\fcharset0 Courier;
+}
+{\colortbl;\red255\green255\blue255;\red54\green77\blue255;\red242\green244\blue242;\red206\green206\blue206;
+\red100\green100\blue100;}
+{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}
+{\list\listtemplateid2\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}}{\leveltext\leveltemplateid101\'01\'00;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid2}
+{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}}{\leveltext\leveltemplateid201\'01\'00;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid202\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid203\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li2160\lin2160 }{\listname ;}\listid3}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\deftab720
+\pard\pardeftab720\fi220\sa240\partightenfactor0
+
+\f0\b\fs46 \cf0 \expnd0\expndtw0\kerning0
+\
+Installing Packages 
+\f1\b0\fs24 \
+\pard\pardeftab720\fi220\sl-560\sa240\partightenfactor0
+
+\f0\b\fs32 \cf2 System Requirements\
+\pard\tx713\tx1002\pardeftab720\li1025\fi-1026\sl408\slmult1\partightenfactor0
+\ls1\ilvl0
+\b0\fs24 \cf0 \kerning1\expnd0\expndtw0 {\listtext	\'95	}Intel based Mac\
+{\listtext	\'95	}OS X 10.4 or later\
+{\listtext	\'95	}Installing Packages requires administrative privileges. if you're not the administrator of the machine, contact him/her.\
+\pard\tx720\tx1002\pardeftab720\sl408\slmult1\partightenfactor0
+
+\f1 \cf0 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\fi220\sl-560\sa240\partightenfactor0
+
+\f0\b\fs32 \cf2 \expnd0\expndtw0\kerning0
+Installing Packages on a single computer 
+\f1\b0\fs24 \cf0 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\fi220\sl-340\sa240\partightenfactor0
+
+\f0 \cf0 \expnd0\expndtw0\kerning0
+To manually install Packages on a Mac, follow these instructions:\
+\pard\tx408\tx720\pardeftab720\li720\fi-720\sl-340\sa240\partightenfactor0
+\ls2\ilvl0\cf0 \kerning1\expnd0\expndtw0 {\listtext	1	}Double-click the Latino-XXX-Darwin.pkg disk image file to mount it on the desktop.\
+{\listtext	2	}Double-click the Packages volume.\
+{\listtext	3	}Double-click the Installer Packages distribution to start the installation.\
+{\listtext	4	}Follow the instructions displayed by the Installer application.\expnd0\expndtw0\kerning0
+\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clwWidth440\clftsWidth3 \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clwWidth17520\clftsWidth3 \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clwWidth20\clftsWidth3 \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\fi220\sa240\partightenfactor0
+\cf0 \expnd0\expndtw0\kerning0
+\cell 
+
+\itap2\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clcbpat3 \clwWidth16920\clftsWidth3 \clheight1260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap2\pardeftab720\li220\sl-320\partightenfactor0
+
+\b \cf0 Note
+\b0 : When the files are going to be installed, 
+\f2 Installer 
+\f0 will look for the location of a previous version of Packages. If no previous versions are found, the Packages application will overwrite the previews version without notification.\nestcell \lastrow\nestrow\cell 
+\pard\intbl\itap1\pardeftab720\fi220\sa240\partightenfactor0
+\cf0 \cell \lastrow\row
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clmgf \clvertalc \clshdrawnil \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr100 \gaph\cellx2880
+\clmrg \clvertalc \clshdrawnil \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr100 \gaph\cellx5760
+\clmrg \clvertalc \clshdrawnil \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\fi220\sa240\partightenfactor0
+\cf0 \
+\pard\intbl\itap1\pardeftab720\fi220\sl-560\sa240\partightenfactor0
+
+\b\fs32 \cf2 \expnd0\expndtw0\kerning0
+Uninstall Latino on Mac OS X
+\f1\b0\fs24 \cf0 \expnd0\expndtw0\kerning0
+\
+\pard\intbl\itap1\pardeftab720\fi220\sl-340\sa240\partightenfactor0
+
+\f0 \cf0 \expnd0\expndtw0\kerning0
+To uninstall Latino on your Mac you may follow the following steps:\
+\pard\intbl\itap1\tx408\tx720\pardeftab720\li720\fi-720\sl-340\sa240\partightenfactor0
+\ls3\ilvl0\cf0 \kerning1\expnd0\expndtw0 {\listtext	1	}Double-click the Latino-XXX_Darwin.pkg disk image file to mount it on the desktop.\
+{\listtext	2	}Double-click the Packages volume.\
+{\listtext	3	}Double-click on the 
+\b Extras
+\b0  folder.\
+{\listtext	4	}Open you Terminal in your Mac.\
+{\listtext	5	}Type "
+\b sudo sh 
+\b0 " (leave a space at the end of the line).\
+{\listtext	6	}Drag and drop the 
+\b uninstall.sh
+\b0  file in your terminal.\
+\pard\intbl\itap1\tx940\tx1440\pardeftab720\li1440\fi-1440\sl-340\sa240\partightenfactor0
+\ls3\ilvl1\cf0 {\listtext	\uc0\u8259 	}Example:\
+\pard\intbl\itap1\tx1660\tx2160\pardeftab720\li2160\fi-2160\sl-340\sa240\partightenfactor0
+\ls3\ilvl2\cf0 {\listtext	\uc0\u8259 	}
+\b $ sudo sh /Volumes/Latino-XXX-Darwin/Extras/uninstall.sh
+\b0 \
+\pard\intbl\itap1\tx408\tx720\pardeftab720\li720\fi-720\sl-340\sa240\partightenfactor0
+\ls3\ilvl0\cf0 {\listtext	7	}Press 
+\b Enter
+\b0  to run the command and proceed by typing your administrator password to complete with the uninstall process.\expnd0\expndtw0\kerning0
+\cell 
+\pard\intbl\itap1\cell 
+\pard\intbl\itap1\cell \lastrow\row
+\pard\pardeftab720\fi220\sa240\partightenfactor0
+
+\fs22 \cf5 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\li220\sa240\partightenfactor0
+\cf5 Copyright 2020 Melvin Guerrero. All rights reserved. Apple, Mac and Mac OS and macOS are trademarks of Apple, Inc. \
+\pard\pardeftab720\fi220\sa240\partightenfactor0
+
+\f1\fs24 \cf0 \expnd0\expndtw0\kerning0
+\
+}
\ No newline at end of file
diff --git a/paquetes/MacOS/Extras/es/.DS_Store b/paquetes/MacOS/Extras/es/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/paquetes/MacOS/Extras/es/.DS_Store differ
diff --git a/paquetes/MacOS/Extras/es/Leeme Antes de Instalar.rtf b/paquetes/MacOS/Extras/es/Leeme Antes de Instalar.rtf
new file mode 100644
index 00000000..4136072c
--- /dev/null
+++ b/paquetes/MacOS/Extras/es/Leeme Antes de Instalar.rtf	
@@ -0,0 +1,129 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\froman\fcharset0 Times-Roman;}
+{\colortbl;\red255\green255\blue255;\red54\green77\blue255;\red242\green244\blue242;\red206\green206\blue206;
+\red100\green100\blue100;}
+{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}
+{\list\listtemplateid2\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}}{\leveltext\leveltemplateid101\'01\'00;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid2}
+{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}}{\leveltext\leveltemplateid201\'01\'00;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid202\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid203\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li2160\lin2160 }{\listname ;}\listid3}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\deftab720
+\pard\pardeftab720\fi220\sa240\partightenfactor0
+
+\f0\b\fs46 \cf0 \expnd0\expndtw0\kerning0
+\
+Instalaci\'f3n de Paquete
+\f1\b0\fs24 \
+\pard\pardeftab720\fi220\sl-560\sa240\partightenfactor0
+
+\f0\b\fs32 \cf2 Requerimientos del Sistema\
+\pard\tx713\tx1002\pardeftab720\li1025\fi-1026\sl408\slmult1\partightenfactor0
+\ls1\ilvl0
+\b0\fs24 \cf0 \kerning1\expnd0\expndtw0 {\listtext	\'95	}Mac con procesador Intel\
+{\listtext	\'95	}OS X 10.4 o posterior\
+{\listtext	\'95	}El paquete de instalaci\'f3n requiere privilegios de administrador. Si usted no es el administrador de la maquina, contacte con el/ella.\
+\pard\tx720\tx1002\pardeftab720\fi211\sl408\slmult1\partightenfactor0
+
+\f1 \cf0 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\fi220\sl-560\sa240\partightenfactor0
+
+\f0\b\fs32 \cf2 \expnd0\expndtw0\kerning0
+Instalaci\'f3n de Paquete en la computadora local
+\f1\b0\fs24 \cf0 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\fi220\sl-340\sa240\partightenfactor0
+
+\f0 \cf0 \expnd0\expndtw0\kerning0
+Para instalar el paquete en Mac, siga las siguientes instrucciones:\
+\pard\tx408\tx720\pardeftab720\li720\fi-720\sl-340\sa240\partightenfactor0
+\ls2\ilvl0\cf0 \kerning1\expnd0\expndtw0 {\listtext	
+\b \cf2 1
+\b0 \cf0 	}Doble-clic en nuestro paquete de instalaci\'f3n Latino-XXX-Darwin.pkg.\
+{\listtext	
+\b \cf2 2
+\b0 \cf0 	}Doble-clic al volumen del paquete que apareci\'f3 en nuestro escritorio en Mac.\
+{\listtext	
+\b \cf2 3
+\b0 \cf0 	}Doble-clic al paquete de instalaci\'f3n para iniciar con la instalaci\'f3n.\
+{\listtext	
+\b \cf2 4
+\b0 \cf0 	}Seguimos las instrucciones del paquete de instalaci\'f3n hasta terminar.\expnd0\expndtw0\kerning0
+\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clwWidth440\clftsWidth3 \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clwWidth17520\clftsWidth3 \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clwWidth20\clftsWidth3 \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\fi220\sa240\partightenfactor0
+\cf0 \expnd0\expndtw0\kerning0
+\cell 
+
+\itap2\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clcbpat3 \clwWidth16920\clftsWidth3 \clheight1260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap2\pardeftab720\li220\sl-320\partightenfactor0
+
+\b \cf0 Nota
+\b0 : Cuando se inicia el proceso para instalar, el paquete de instalaci\'f3n comprobara que no se tenga una versi\'f3n anterior. En caso de encontrar una versi\'f3n anterior, la nueva versi\'f3n sobrescribir\'e1 la antigua versi\'f3n sin previo aviso.\nestcell \lastrow\nestrow\cell 
+\pard\intbl\itap1\pardeftab720\fi220\sa240\partightenfactor0
+\cf0 \cell \lastrow\row
+\pard\pardeftab720\fi220\sl-340\sa240\partightenfactor0
+\cf0 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\fi220\sl-560\sa240\partightenfactor0
+
+\b\fs32 \cf2 \expnd0\expndtw0\kerning0
+Desinstalar Latino en Mac OS X
+\f1\b0\fs24 \cf0 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\fi220\sl-340\sa240\partightenfactor0
+
+\f0 \cf0 \expnd0\expndtw0\kerning0
+Para desinstalar Latino en Mac estos son los pasos a seguir:\
+\pard\tx408\tx720\pardeftab720\li720\fi-720\sl-340\sa240\partightenfactor0
+\ls3\ilvl0\cf0 \kerning1\expnd0\expndtw0 {\listtext	
+\b \cf2 1
+\b0 \cf0 	}Doble-clic en nuestro paquete de instalaci\'f3n Latino-XXX-Darwin.pkg.\
+{\listtext	
+\b \cf2 2
+\b0 \cf0 	}Una vez nuestra imagen sea montada en nuestro escritorio hacemos doble-clic para abrir.\
+{\listtext	
+\b \cf2 3
+\b0 \cf0 	}Doble-clic en la carpeta llamada 
+\b Extras
+\b0 .\
+{\listtext	
+\b \cf2 4
+\b0 \cf0 	}Abrimos nuestra Terminal en Mac.\
+{\listtext	
+\b \cf2 5
+\b0 \cf0 	}Escribimos "
+\b sudo sh 
+\b0 " (le dejamos un espacio al final).\
+{\listtext	
+\b \cf2 6
+\b0 \cf0 	}Agarramos y soltamos nuestro archivo 
+\b uninstall.sh
+\b0  en nuestra Terminal.\
+\pard\tx940\tx1440\pardeftab720\li1440\fi-1440\sl-340\sa240\partightenfactor0
+\ls3\ilvl1\cf0 {\listtext	\uc0\u8259 	}Ejemplo:\
+\pard\tx1660\tx2160\pardeftab720\li2160\fi-2160\sl-340\sa240\partightenfactor0
+\ls3\ilvl2\cf0 {\listtext	\uc0\u8259 	}
+\b $ sudo sh /Volumes/Latino-XXX-Darwin/Extras/uninstall.sh
+\b0 \
+\pard\tx408\tx720\pardeftab720\li720\fi-720\sl-340\sa240\partightenfactor0
+\ls3\ilvl0\cf0 {\listtext	7	}Presionamos 
+\b Enter
+\b0  para correr el comando y procedemos con insertar nuestra contrase\'f1a de administrador.
+\fs22 \cf5 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\fi220\sa240\partightenfactor0
+\cf5 \expnd0\expndtw0\kerning0
+\
+\pard\pardeftab720\li220\sa240\partightenfactor0
+\cf5 Copyright 2020 Melvin Guerrero. All rights reserved. Apple, Mac and Mac OS and macOS are trademarks of Apple, Inc. \
+\pard\pardeftab720\fi220\sa240\partightenfactor0
+
+\f1\fs24 \cf0 \expnd0\expndtw0\kerning0
+\
+}
\ No newline at end of file
diff --git a/paquetes/MacOS/Extras/uninstall.sh b/paquetes/MacOS/Extras/uninstall.sh
new file mode 100755
index 00000000..a6574d7c
--- /dev/null
+++ b/paquetes/MacOS/Extras/uninstall.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+## Remove Latino-MySQL library
+
+sudo /bin/rm -f /usr/local/bin/latino
+sudo /bin/rm -f /usr/local/lib/liblatino.dylib
+sudo /bin/rm -f /usr/local/lib/libliblatino_static.a
+sudo /bin/rm -f /usr/local/share/man/man1/latino.1.gz
+sudo /bin/rm -f /usr/local/share/nano/latino.nanorc
+sudo /bin/rm -f /usr/local/share/applications/latino.desktop
+sudo /bin/rm -f /usr/local/share/latino/desktop.png
+sudo /bin/rm -f /usr/local/include/latino.h
+sudo /bin/rm -f /usr/local/include/latast.h
+sudo /bin/rm -f /usr/local/include/latcompat.h
+sudo /bin/rm -f /usr/local/include/latdic.h
+sudo /bin/rm -f /usr/local/include/latdo.h
+sudo /bin/rm -f /usr/local/include/latlist.h
+sudo /bin/rm -f /usr/local/include/latmem.h
+sudo /bin/rm -f /usr/local/include/latmv.h
+sudo /bin/rm -f /usr/local/include/latobj.h
+
+exit 0
\ No newline at end of file
diff --git a/paquetes/MacOS/Latino-1.2.0-Darwin.pkgproj b/paquetes/MacOS/Latino-1.2.0-Darwin.pkgproj
new file mode 100755
index 00000000..9854d35e
--- /dev/null
+++ b/paquetes/MacOS/Latino-1.2.0-Darwin.pkgproj
@@ -0,0 +1,3388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PACKAGES</key>
+	<array>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/usr/local/bin</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array/>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Automator</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Extensions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>80</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/build/src/Debug/latino</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>80</integer>
+											<key>PATH</key>
+											<string>bin</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>local</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>usr</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>2</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>4</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>com.lenguajelatino.pkg.Latino</string>
+				<key>NAME</key>
+				<string>Latino-1.2.0-Darwin</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<true/>
+				<key>VERSION</key>
+				<string>1.2.0</string>
+			</dict>
+			<key>UUID</key>
+			<string>94867483-85B5-4BA0-B558-E632315FFD41</string>
+		</dict>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/usr/local/lib</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array/>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Automator</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Extensions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/build/src/Debug/liblatino.dylib</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/build/src/Debug/libliblatino_static.a</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>lib</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>local</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>usr</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>2</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>4</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>com.lenguajelatino.pkg.Latino-libs</string>
+				<key>LOCATION</key>
+				<integer>0</integer>
+				<key>NAME</key>
+				<string>Latino-libs</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<true/>
+				<key>VERSION</key>
+				<string>1.2.0</string>
+			</dict>
+			<key>TYPE</key>
+			<integer>0</integer>
+			<key>UUID</key>
+			<string>0232C672-59C1-410F-B580-E2FB4B32131D</string>
+		</dict>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/usr/local/include</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array/>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Automator</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Extensions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/include/latast.h</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/include/latcompat.h</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/include/latdic.h</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/include/latdo.h</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/include/latino.h</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/include/latlist.h</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/include/latmem.h</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/include/latmv.h</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>/Users/Manual_Latino/Documents/Latino/include/latobj.h</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>420</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>include</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>local</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>usr</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>2</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>4</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>com.lenguajelatino.pkg.Latino-componentes</string>
+				<key>LOCATION</key>
+				<integer>0</integer>
+				<key>NAME</key>
+				<string>Developer components</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<true/>
+				<key>VERSION</key>
+				<string>1.2.0</string>
+			</dict>
+			<key>TYPE</key>
+			<integer>0</integer>
+			<key>UUID</key>
+			<string>E973EDDC-FF55-432C-B9C2-6981A4D605AE</string>
+		</dict>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/usr/local/share/nano</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array/>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Automator</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Extensions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array>
+														<dict>
+															<key>CHILDREN</key>
+															<array/>
+															<key>GID</key>
+															<integer>0</integer>
+															<key>PATH</key>
+															<string>/Users/Manual_Latino/Documents/Latino/src/gnu-utilities/latino.nanorc</string>
+															<key>PATH_TYPE</key>
+															<integer>0</integer>
+															<key>PERMISSIONS</key>
+															<integer>420</integer>
+															<key>TYPE</key>
+															<integer>3</integer>
+															<key>UID</key>
+															<integer>0</integer>
+														</dict>
+													</array>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>nano</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>2</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>share</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>local</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>usr</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>2</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>4</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>com.lenguajelatino.pkg.Latino-nanorc</string>
+				<key>LOCATION</key>
+				<integer>0</integer>
+				<key>NAME</key>
+				<string>Latino-nanorc</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<true/>
+				<key>VERSION</key>
+				<string>1.2.0</string>
+			</dict>
+			<key>TYPE</key>
+			<integer>0</integer>
+			<key>UUID</key>
+			<string>44A7DD58-BD86-4FA3-AC33-B10D26A3DC45</string>
+		</dict>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/usr/local/share/man/man1</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array/>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Automator</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Extensions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array>
+														<dict>
+															<key>CHILDREN</key>
+															<array>
+																<dict>
+																	<key>CHILDREN</key>
+																	<array/>
+																	<key>GID</key>
+																	<integer>0</integer>
+																	<key>PATH</key>
+																	<string>/Users/Manual_Latino/Documents/Latino/src/man/latino.1.gz</string>
+																	<key>PATH_TYPE</key>
+																	<integer>0</integer>
+																	<key>PERMISSIONS</key>
+																	<integer>420</integer>
+																	<key>TYPE</key>
+																	<integer>3</integer>
+																	<key>UID</key>
+																	<integer>0</integer>
+																</dict>
+															</array>
+															<key>GID</key>
+															<integer>0</integer>
+															<key>PATH</key>
+															<string>man1</string>
+															<key>PATH_TYPE</key>
+															<integer>0</integer>
+															<key>PERMISSIONS</key>
+															<integer>493</integer>
+															<key>TYPE</key>
+															<integer>2</integer>
+															<key>UID</key>
+															<integer>0</integer>
+														</dict>
+													</array>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>man</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>2</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>share</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>local</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>usr</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>2</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>4</integer>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>com.lenguajelatino.pkg.Latino-man</string>
+				<key>LOCATION</key>
+				<integer>0</integer>
+				<key>NAME</key>
+				<string>Latino-man</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<true/>
+				<key>VERSION</key>
+				<string>1.2.0</string>
+			</dict>
+			<key>TYPE</key>
+			<integer>0</integer>
+			<key>UUID</key>
+			<string>3BDCC799-AE8F-49B3-95AB-55AFD5B4CBF3</string>
+		</dict>
+	</array>
+	<key>PROJECT</key>
+	<dict>
+		<key>PROJECT_COMMENTS</key>
+		<dict>
+			<key>NOTES</key>
+			<data>
+			PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M
+			IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv
+			c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l
+			cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7
+			IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250
+			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
+			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
+			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
+			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExMzguNTEiPgo8c3R5bGUg
+			dHlwZT0idGV4dC9jc3MiPgpwLnAxIHttYXJnaW46IDAuMHB4IDAu
+			MHB4IDAuMHB4IDAuMHB4OyBmb250OiAxMi4wcHggSGVsdmV0aWNh
+			fQo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5Pgo8cCBjbGFzcz0icDEi
+			Pkluc3RhbGFjacOzbiBkZSBMYXRpbm8tMS4yLjAtRGFyd2luPC9w
+			Pgo8L2JvZHk+CjwvaHRtbD4K
+			</data>
+		</dict>
+		<key>PROJECT_PRESENTATION</key>
+		<dict>
+			<key>BACKGROUND</key>
+			<dict>
+				<key>ALIGNMENT</key>
+				<integer>6</integer>
+				<key>BACKGROUND_PATH</key>
+				<dict>
+					<key>PATH</key>
+					<string>/Users/Manual_Latino/Documents/Latino/paquetes/MacOS/src/background.png</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+				</dict>
+				<key>CUSTOM</key>
+				<integer>1</integer>
+				<key>SCALING</key>
+				<integer>0</integer>
+			</dict>
+			<key>INSTALLATION TYPE</key>
+			<dict>
+				<key>HIERARCHIES</key>
+				<dict>
+					<key>INSTALLER</key>
+					<dict>
+						<key>LIST</key>
+						<array>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array>
+									<dict>
+										<key>LANGUAGE</key>
+										<string>English</string>
+										<key>VALUE</key>
+										<string>Latino is a programming language with Spanish syntax.</string>
+									</dict>
+									<dict>
+										<key>LANGUAGE</key>
+										<string>Spanish</string>
+										<key>VALUE</key>
+										<string>Latino es un lenguaje de programación con sintaxis al Español.</string>
+									</dict>
+								</array>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<false/>
+									<key>STATE</key>
+									<integer>0</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>94867483-85B5-4BA0-B558-E632315FFD41</string>
+								<key>REQUIREMENTS</key>
+								<array/>
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>65C87F48-6849-4B3C-B451-726F2FC4D158</string>
+							</dict>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<true/>
+									<key>STATE</key>
+									<integer>0</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>0232C672-59C1-410F-B580-E2FB4B32131D</string>
+								<key>REQUIREMENTS</key>
+								<array/>
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>02C97694-87CD-4735-AC44-A274958C3F6C</string>
+							</dict>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array>
+									<dict>
+										<key>LANGUAGE</key>
+										<string>English</string>
+										<key>VALUE</key>
+										<string>This package contains all the libraries necessary to use the Latino-API in C</string>
+									</dict>
+									<dict>
+										<key>LANGUAGE</key>
+										<string>Spanish</string>
+										<key>VALUE</key>
+										<string>Éste paquete contiene todos las librerias necesarias para usar la API de Latino en C</string>
+									</dict>
+								</array>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<false/>
+									<key>STATE</key>
+									<integer>1</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>E973EDDC-FF55-432C-B9C2-6981A4D605AE</string>
+								<key>REQUIREMENTS</key>
+								<array/>
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>21B5B639-8DF6-4459-ACE0-1F93CCF7C8BD</string>
+							</dict>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<true/>
+									<key>STATE</key>
+									<integer>0</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>44A7DD58-BD86-4FA3-AC33-B10D26A3DC45</string>
+								<key>REQUIREMENTS</key>
+								<array/>
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>14D5914C-E16E-4345-B986-8EC1E027E8F7</string>
+							</dict>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<true/>
+									<key>STATE</key>
+									<integer>0</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>3BDCC799-AE8F-49B3-95AB-55AFD5B4CBF3</string>
+								<key>REQUIREMENTS</key>
+								<array/>
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>CE02DE27-F9AD-45D0-9D8E-3ED1FB225C7E</string>
+							</dict>
+						</array>
+						<key>REMOVED</key>
+						<dict/>
+					</dict>
+				</dict>
+				<key>INSTALLATION TYPE</key>
+				<integer>0</integer>
+				<key>MODE</key>
+				<integer>0</integer>
+			</dict>
+			<key>INSTALLATION_STEPS</key>
+			<array>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewIntroductionController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>Introduction</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewReadMeController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>ReadMe</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewLicenseController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>License</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewDestinationSelectController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>TargetSelect</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewInstallationTypeController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>PackageSelection</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewInstallationController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>Install</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewSummaryController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>Summary</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+			</array>
+			<key>INTRODUCTION</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array/>
+			</dict>
+			<key>LICENSE</key>
+			<dict>
+				<key>KEYWORDS</key>
+				<dict/>
+				<key>LOCALIZATIONS</key>
+				<array>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>English</string>
+						<key>VALUE</key>
+						<dict>
+							<key>PATH</key>
+							<string>/Users/Manual_Latino/Documents/Latino/paquetes/MacOS/src/license.rtf</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</dict>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>Spanish</string>
+						<key>VALUE</key>
+						<dict>
+							<key>PATH</key>
+							<string>/Users/Manual_Latino/Documents/Latino/paquetes/MacOS/src/licencia.rtf</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</dict>
+				</array>
+				<key>MODE</key>
+				<integer>0</integer>
+			</dict>
+			<key>README</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>English</string>
+						<key>VALUE</key>
+						<dict>
+							<key>PATH</key>
+							<string>/Users/Manual_Latino/Documents/Latino/paquetes/MacOS/src/readme.rtf</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</dict>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>Spanish</string>
+						<key>VALUE</key>
+						<dict>
+							<key>PATH</key>
+							<string>/Users/Manual_Latino/Documents/Latino/paquetes/MacOS/src/leeme.rtf</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</dict>
+				</array>
+			</dict>
+			<key>TITLE</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>Spanish</string>
+						<key>VALUE</key>
+						<string>Latino-1.2.0-Darwin</string>
+					</dict>
+				</array>
+			</dict>
+		</dict>
+		<key>PROJECT_REQUIREMENTS</key>
+		<dict>
+			<key>LIST</key>
+			<array>
+				<dict>
+					<key>BEHAVIOR</key>
+					<integer>3</integer>
+					<key>DICTIONARY</key>
+					<dict>
+						<key>IC_REQUIREMENT_RAM_MINIMUM_SIZE_INDEX</key>
+						<integer>0</integer>
+					</dict>
+					<key>IC_REQUIREMENT_CHECK_TYPE</key>
+					<integer>0</integer>
+					<key>IDENTIFIER</key>
+					<string>fr.whitebox.Packages.requirement.ram</string>
+					<key>MESSAGE</key>
+					<array>
+						<dict>
+							<key>LANGUAGE</key>
+							<string>English</string>
+							<key>SECONDARY_VALUE</key>
+							<string>You need more RAM memory for this installation.</string>
+							<key>VALUE</key>
+							<string>Need more RAM memory</string>
+						</dict>
+						<dict>
+							<key>LANGUAGE</key>
+							<string>Spanish</string>
+							<key>SECONDARY_VALUE</key>
+							<string>Usted necesita más memoria RAM en su sistema para esta instalación.</string>
+							<key>VALUE</key>
+							<string>No hay suficiente memoria RAM</string>
+						</dict>
+					</array>
+					<key>NAME</key>
+					<string>Installed RAM</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>BEHAVIOR</key>
+					<integer>3</integer>
+					<key>DICTIONARY</key>
+					<dict>
+						<key>IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY</key>
+						<integer>2</integer>
+						<key>IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE</key>
+						<integer>2</integer>
+						<key>IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT</key>
+						<integer>1</integer>
+						<key>IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY</key>
+						<integer>866666</integer>
+						<key>IC_REQUIREMENT_CPU_POWERPC_ARCHITECTURE_TYPE</key>
+						<integer>0</integer>
+					</dict>
+					<key>IC_REQUIREMENT_CHECK_TYPE</key>
+					<integer>0</integer>
+					<key>IDENTIFIER</key>
+					<string>fr.whitebox.Packages.requirement.cpu</string>
+					<key>MESSAGE</key>
+					<array>
+						<dict>
+							<key>LANGUAGE</key>
+							<string>English</string>
+							<key>SECONDARY_VALUE</key>
+							<string>For this installation you need an Intel processor of 64-bit</string>
+							<key>VALUE</key>
+							<string>Incompatible Processor</string>
+						</dict>
+						<dict>
+							<key>LANGUAGE</key>
+							<string>Spanish</string>
+							<key>SECONDARY_VALUE</key>
+							<string>Para esta Instalación se requiere un procesador Intel de 64-bit</string>
+							<key>VALUE</key>
+							<string>Procesador Incompatible</string>
+						</dict>
+					</array>
+					<key>NAME</key>
+					<string>Processor</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>BEHAVIOR</key>
+					<integer>3</integer>
+					<key>DICTIONARY</key>
+					<dict>
+						<key>IC_REQUIREMENT_DISKSPACE_MINIMUM_SIZE_UNIT</key>
+						<integer>0</integer>
+						<key>IC_REQUIREMENT_DISKSPACE_MINIMUM_SIZE_VALUE</key>
+						<integer>20</integer>
+					</dict>
+					<key>IC_REQUIREMENT_CHECK_TYPE</key>
+					<integer>1</integer>
+					<key>IDENTIFIER</key>
+					<string>fr.whitebox.Packages.requirement.diskspace</string>
+					<key>MESSAGE</key>
+					<array>
+						<dict>
+							<key>LANGUAGE</key>
+							<string>English</string>
+							<key>VALUE</key>
+							<string>You do not have enough space on the seleted disk.</string>
+						</dict>
+						<dict>
+							<key>LANGUAGE</key>
+							<string>Spanish</string>
+							<key>VALUE</key>
+							<string>Usted no tiene suficiente espacio de almacenamiento en el disco seleccionado.</string>
+						</dict>
+					</array>
+					<key>NAME</key>
+					<string>Available Disk Space</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+			</array>
+			<key>POSTINSTALL_PATH</key>
+			<dict/>
+			<key>PREINSTALL_PATH</key>
+			<dict/>
+			<key>RESOURCES</key>
+			<array/>
+			<key>ROOT_VOLUME_ONLY</key>
+			<false/>
+		</dict>
+		<key>PROJECT_SETTINGS</key>
+		<dict>
+			<key>ADVANCED_OPTIONS</key>
+			<dict/>
+			<key>BUILD_FORMAT</key>
+			<integer>0</integer>
+			<key>BUILD_PATH</key>
+			<dict>
+				<key>PATH</key>
+				<string>build</string>
+				<key>PATH_TYPE</key>
+				<integer>1</integer>
+			</dict>
+			<key>EXCLUDED_FILES</key>
+			<array>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.DS_Store</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove .DS_Store files</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove ".DS_Store" files created by the Finder.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.pbdevelopment</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove .pbdevelopment files</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove ".pbdevelopment" files created by ProjectBuilder or Xcode.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>CVS</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.cvsignore</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.cvspass</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.svn</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.git</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.gitignore</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove SCM metadata</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>classes.nib</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>designable.db</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>info.nib</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Optimize nib files</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>Resources Disabled</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove Resources Disabled folders</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove "Resources Disabled" folders.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>SEPARATOR</key>
+					<true/>
+				</dict>
+			</array>
+			<key>NAME</key>
+			<string>Latino-1.2.0-Darwin</string>
+		</dict>
+	</dict>
+	<key>TYPE</key>
+	<integer>0</integer>
+	<key>VERSION</key>
+	<integer>2</integer>
+</dict>
+</plist>
diff --git a/paquetes/MacOS/src/.DS_Store b/paquetes/MacOS/src/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/paquetes/MacOS/src/.DS_Store differ
diff --git a/paquetes/MacOS/src/background.png b/paquetes/MacOS/src/background.png
new file mode 100644
index 00000000..7bf08fe4
Binary files /dev/null and b/paquetes/MacOS/src/background.png differ
diff --git a/paquetes/MacOS/src/leeme.rtf b/paquetes/MacOS/src/leeme.rtf
new file mode 100644
index 00000000..068dfa4c
--- /dev/null
+++ b/paquetes/MacOS/src/leeme.rtf
@@ -0,0 +1,38 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs24 \cf0 Gracias por su apoyo en este proyecto llamado Latino.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+\cf0 \
+Como ya sabr\'e1 Latino es un lenguaje de programaci\'f3n con sintaxis al Espa\'f1ol, el cual tiene soporte para ser instalado en todos los sistemas operativos m\'e1s populares como son MS Windows, Apple Mac OS X y Linux (Ubuntu, Fedora, Kubuntu, etc.)\
+\
+
+\b Ejecuci\'f3n:\
+
+\b0 Al finalizar esta instalaci\'f3n podr\'e1 ejecutar Latino desde su terminal escribiendo el comando 
+\b latino
+\b0  seguido de Enter.\
+\
+
+\b Gu\'eda y Ayuda de Latino:\
+
+\b0 Para m\'e1s ayuda e informaci\'f3n, puede visitar los siguientes sitios web a continuaci\'f3n:\
+\
+
+\b Manual de Latino (Gu\'eda):\
+{\field{\*\fldinst{HYPERLINK "http://manuallatino.blogspot.com"}}{\fldrslt 
+\b0 manuallatino.blogspot.com}}
+\b0 \
+\
+
+\b Repositorio en GitHub:
+\b0 \
+{\field{\*\fldinst{HYPERLINK "http://github.com/lenguaje-latino/latino"}}{\fldrslt github.com/lenguaje-latino/latino}}\
+\
+
+\b P\'e1gina Oficial de Latino:
+\b0 \
+{\field{\*\fldinst{HYPERLINK "http://lenguaje-latino.org"}}{\fldrslt lenguaje-latino.org}}}
\ No newline at end of file
diff --git a/paquetes/MacOS/src/licencia.rtf b/paquetes/MacOS/src/licencia.rtf
new file mode 100644
index 00000000..04d896ef
--- /dev/null
+++ b/paquetes/MacOS/src/licencia.rtf
@@ -0,0 +1,15 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+
+\f0\fs24 \cf0 Licencia MIT\
+\
+Copyright (c) 2020 Lenguaje Latino\
+\
+Por la presente, se otorga permiso, de forma gratuita, a cualquier persona que obtenga una copia de este software y los archivos de documentaci\'f3n asociados (el "Software"), para negociar el Software sin restricciones, incluidos, entre otros, los derechos de uso, copia, modificaci\'f3n, fusi\'f3n , publicar, distribuir, sublicenciar y / o vender copias del Software, y permitir que las personas a quienes se les proporcione el Software lo hagan, sujeto a las siguientes condiciones:\
+\
+El aviso de copyright anterior y este aviso de permiso se incluir\'e1n en todas las copias o partes sustanciales del Software.\
+\
+EL SOFTWARE SE PROPORCIONA "TAL CUAL", SIN GARANT\'cdA DE NING\'daN TIPO, EXPRESA O IMPL\'cdCITA, INCLUYENDO PERO SIN LIMITARSE A LAS GARANT\'cdAS DE COMERCIABILIDAD, APTITUD PARA UN PROP\'d3SITO Y NO INFRACCI\'d3N PARTICULARES. EN NING\'daN CASO, LOS AUTORES O LOS TITULARES DE LOS DERECHOS DE AUTOR SER\'c1N RESPONSABLES DE NING\'daN RECLAMO, DA\'d1OS U OTRA RESPONSABILIDAD, YA SEA EN ACCI\'d3N DE CONTRATO, TORT O DE OTRA MANERA, DERIVADA DE, FUERA DE, O EN RELACI\'d3N CON EL SOFTWARE O EL USO O OTRO TRATO EN EL SOFTWARE.}
\ No newline at end of file
diff --git a/paquetes/MacOS/src/license.rtf b/paquetes/MacOS/src/license.rtf
new file mode 100644
index 00000000..e501040c
--- /dev/null
+++ b/paquetes/MacOS/src/license.rtf
@@ -0,0 +1,16 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww10360\viewh12480\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+
+\f0\fs24 \cf0 MIT License\
+\
+Copyright (c) 2020 Lenguaje Latino\
+\
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\
+\
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\
+\
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\
+}
\ No newline at end of file
diff --git a/paquetes/MacOS/src/nano-install.sh b/paquetes/MacOS/src/nano-install.sh
new file mode 100755
index 00000000..79cd16c1
--- /dev/null
+++ b/paquetes/MacOS/src/nano-install.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+## Remove Latino-MySQL library
+
+# sudo nano ~/.nanorc
+#
+# sudo cat ~/.nanorc
+# n=1
+# while read -r line; do
+# 	echo "include \"/usr/local/share/nano/latino.nanorc\""
+# 	n=$((n+1))
+# done < ~/.nanorc
+
+# sed -e 'include "/usr/local/share/nano/latino.nanorc"' ~/.nanorc
+
+exit 0
\ No newline at end of file
diff --git a/paquetes/MacOS/src/readme.rtf b/paquetes/MacOS/src/readme.rtf
new file mode 100644
index 00000000..cf9257f7
--- /dev/null
+++ b/paquetes/MacOS/src/readme.rtf
@@ -0,0 +1,41 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs24 \cf0 Thank you for your support on this project named Latino.\
+\
+As you know Latino is a programming language with Spanish syntax. You can run Latino on a verity of OS such as MS-Windows, Apple Mac OS X and Linux (Ubuntu, Fedora, Kubuntu, etc.)\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+\cf0 \
+
+\b How to run Latino:\
+
+\b0 After finish with the installation you can run latino from your terminal by type the following command 
+\b latino
+\b0  and after press Enter.\
+\
+
+\b Latino help and guide:\
+
+\b0 I you want to lear more about this programming language you can visit:\
+\
+
+\b Latino Manual (Spanish Only):\
+{\field{\*\fldinst{HYPERLINK "http://manuallatino.blogspot.com"}}{\fldrslt 
+\b0 manuallatino.blogspot.com}}
+\b0 \
+\
+
+\b Github Repository:\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+{\field{\*\fldinst{HYPERLINK "https://github.com/lenguaje-latino/Latino-MySQL"}}{\fldrslt 
+\b0 \cf0 github.com/lenguaje-latino/Latino-MySQL\
+}}\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+
+\b0 \cf0 \
+
+\b Official web-site:
+\b0 \
+{\field{\*\fldinst{HYPERLINK "http://lenguaje-latino.org"}}{\fldrslt lenguaje-latino.org}}}
\ No newline at end of file
diff --git a/src/gnu-utilities/latino.desktop b/src/gnu-utilities/latino.desktop
index a2f23d32..67305923 100644
--- a/src/gnu-utilities/latino.desktop
+++ b/src/gnu-utilities/latino.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Version=0.9.0
+Version=1.2.0
 Name=Latino
-Comment=Ejecutable de Latino oficial v.0.9.0
+Comment=Ejecutable de Latino oficial v.1.2.0
 Exec=/usr/bin/latino
 Icon=/usr/share/latino/desktop.png
 Terminal=true
 Type=Application
-Categories=Utility;Application;Development;
+Categories=Utility;Application;Development;
\ No newline at end of file
diff --git a/src/gnu-utilities/latino.nanorc b/src/gnu-utilities/latino.nanorc
index 844e4e9c..a495d60d 100644
--- a/src/gnu-utilities/latino.nanorc
+++ b/src/gnu-utilities/latino.nanorc
@@ -1,112 +1,112 @@
-## Sintaxis Latino en Nano
+##############################################################################
+#
+# Latino syntax highlighting for Nano.
+#
+# License: MIT
+#
+# Version: 2020-May-01
+#
+##############################################################################
+
+### Sintaxis Latino en Nano
 syntax "latino" "\.lat$"
-
- # Color de funciones personalizadas del usuario
- color blue "[a-Z_0-9\.]+[(]+.*+[)]"
-
- # Constantes
- color red "^[[:upper:]]+"
-
- ##################################################################
- # Palabras clave
- color magenta "\<(si|osi|sino|fin|romper|continuar|mientras|hacer|cuando|desde|nulo|retorno|caso|defecto|repetir|global|retornar)\>"
- color brightblue "funcion"
- color green "\<(verdadero|cierto|falso)\>"
- color brightmagenta "[[:space:]]+menu"
- color brightblue "elegir[(]+.*+[)]"
- ##################################################################
-
- # libmath.c
- color brightblue "mate\.\<(acos|asen|atan|cos|cosh|sen|senh|tan|tanh|exp|log|log10|raiz|techo|piso|abs|atan2|pot|frexp|ldexp|aleatorio)\>[(]+.*+[)]"
- color brightblue "mate\.\<(acos|asen|atan|cos|cosh|sen|senh|tan|tanh|exp|log|log10|raiz|techo|piso|abs|atan2|pot|frexp|ldexp|aleatorio)\>[[:space:]]+[(]+.*+[)]"
- # libstr.c
- color brightblue "cadena\.\<(esta_vacia|longitud|minusculas|mayusculas|recortar|es_numerico|es_numero|es_alfa|invertir|ejecutar|concatenar|comparar|contiene|termina_con|es_igual|indice|ultimo_indice|eliminar|separar|inicia_con|regex|match|insertar|rellenar_izquierda|rellenar_derecha|reemplazar|subcadena)\>[(]+.*+[)]"
- color brightblue "cadena\.\<(esta_vacia|longitud|minusculas|mayusculas|recortar|es_numerico|es_numero|es_alfa|invertir|ejecutar|concatenar|comparar|contiene|termina_con|es_igual|indice|ultimo_indice|eliminar|separar|inicia_con|regex|match|insertar|rellenar_izquierda|rellenar_derecha|reemplazar|subcadena)\>[[:space:]]+[(]+.*+[)]"
-
+# Color de funciones personalizadas del usuario
+color blue "[a-zA-Z0-9\.]+[(]+.*+[)])"
+# Constantes
+color red "^[[:upper:]]+"
+
+##################################################################
+
+# Palabras clave
+color magenta "\<(si|osi|sino|fin|romper|continuar|mientras|hacer|cuando|desde|nulo|retorno|caso|defecto|repetir|global|retornar)\>"
+color brightblue "funcion"
+color green "\<(verdadero|cierto|falso)\>"
+color brightmagenta "[[:space:]]+menu"
+color brightblue "elegir[(]+.*+[)]"
+
+##################################################################
+
+# libmath.c
+color brightblue "mate\.\<(acos|asen|atan|cos|cosh|sen|senh|tan|tanh|exp|log|log10|raiz|techo|piso|abs|atan2|pot|frexp|ldexp|aleatorio)\>[(]+.*+[)]"
+color brightblue "mate\.\<(acos|asen|atan|cos|cosh|sen|senh|tan|tanh|exp|log|log10|raiz|techo|piso|abs|atan2|pot|frexp|ldexp|aleatorio)\>[[:space:]]+[(]+.*+[)]"
+# libstr.c
+color brightblue "cadena\.\<(esta_vacia|longitud|minusculas|mayusculas|recortar|es_numerico|es_numero|es_alfa|invertir|ejecutar|concatenar|comparar|contiene|termina_con|es_igual|indice|ultimo_indice|eliminar|separar|inicia_con|regex|match|insertar|rellenar_izquierda|rellenar_derecha|reemplazar|subcadena)\>[(]+.*+[)]"
+color brightblue "cadena\.\<(esta_vacia|longitud|minusculas|mayusculas|recortar|es_numerico|es_numero|es_alfa|invertir|ejecutar|concatenar|comparar|contiene|termina_con|es_igual|indice|ultimo_indice|eliminar|separar|inicia_con|regex|match|insertar|rellenar_izquierda|rellenar_derecha|reemplazar|subcadena)\>[[:space:]]+[(]+.*+[)]"
 # libfile.c
 color brightblue "archivo\.\<(leer|lineas|ejecutar|poner|copiar)\>[(]+.*+[)]"
 color brightblue "archivo\.\<(leer|lineas|ejecutar|poner|copiar)\>[[:space:]]+[(]+.*+[)]"
-
- # libbase.c
- color brightblue "\<(poner|poner|acadena|anumero|alogico|leer|limpiar|tipo)\>[(]+.*+[)]"
- color brightblue "\<(poner|poner|acadena|anumero|alogico|leer|limpiar|tipo)\>[[:space:]]+[(]+.*+[)]"
- color cyan "incluir+[(]+.*+[)]|incluir+[[:space:]]+[(]+.*+[)]"
-
- # libcast.c
- color brightblue "convertir\.\<(numerico|logico|cadena)\>[(]+.*+[)]"
- color brightblue "convertir\.\<(numerico|logico|cadena)\>[[:space:]]+[(]+.*+[)]"
-
- # latlist.c
- color brightblue "lista\.\<(invertir|agregar|extender|eliminar_indice|longitud|indice|comparar|insertar|eliminar|contiene)\>[(]+.*+[)]"
- color brightblue "lista\.\<(invertir|agregar|extender|eliminar_indice|longitud|indice|comparar|insertar|eliminar|contiene)\>[[:space:]]+[(]+.*+[)]"
-
- # libcurl.c
- color brightblue "curl\.\<(peticion|sinescape|escape)\>[(]+.*+[)]"
- color brightblue "curl\.\<(peticion|sinescape|escape)\>[[:space:]]+[(]+.*+[)]"
-
- # libjson.c
- color brightblue "json\.\<(decodificar|codificar)\>[(]+.*+[)]"
- color brightblue "json\.\<(decodificar|codificar)\>[[:space:]]+[(]+.*+[)]"
-
- # libgtk.c
- color brightblue "gtk\.\<(iniciar|menu|ventanaNueva|titulo|mostrarTodo|cajaNueva|agregar|ventanaMagnitud|botonTexto|botonDestruir|llamarFuncion)\>[(]+.*+[)]"
- color brightblue "gtk\.\<(iniciar|menu|ventanaNueva|titulo|mostrarTodo|cajaNueva|agregar|ventanaMagnitud|botonTexto|botonDestruir|llamarFuncion)\>[[:space:]]+[(]+.*+[)]"
-
- # libredis.c
- color brightblue "redis\.\<(conectar|desconectar|ping|asignar|hasignar|obtener|hobtener|borrar|hborrar|aumentar|haumentar|incrementar|hincrementar|hllaves|llaves|smiembros|sagregar|sborrar)\>[(]+.*+[)]"
- color brightblue "redis\.\<(conectar|desconectar|ping|asignar|hasignar|obtener|hobtener|borrar|hborrar|aumentar|haumentar|incrementar|hincrementar|hllaves|llaves|smiembros|sagregar|sborrar)\>[[:space:]]+[(]+.*+[)]"
-
- # libsys.c
- color brightblue "sis\.\<(dormir|ejecutar|pipe|fecha|salir|avisar)\>[(]+.*+[)]"
- color brightblue "sis\.\<(dormir|ejecutar|pipe|fecha|salir|avisar)\>[[:space:]]+[(]+.*+[)]"
-
- ##################################################################
- # Numeros
- color brightyellow "\<([0-9]+)\>"
-
- # Operadores
- color yellow ":|\*|/|%|\+|-|\^|>|>=|<|=<|!=|=|&&|\|\|"
-
- # Simbolos
- color brightmagenta "(\(|\)|\[|\]|\{|\})"
-
- # Hexadecimales
- color brightgreen "0x[0-9a-fA-F]*"
-
- # Cierres de cadena
- color brightgreen	start="'" end="'"
- color brightgreen	start="\"" end="\""
- ##################################################################
- # concatenar, despúes de... o antes de..
- color brightwhite "\.\.\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\.\."
- color brightwhite "\.\.\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>"
-  # concatenar con funciones con variables ó númericos
-  color brightwhite "\.\.\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\([a-Z_0-9\.]+\)"
-  color brightwhite "\.\.\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\([a-Z_0-9\.]+\)\.\."
-  # concatenar con funciones cerradas
-  color brightwhite "\.\.\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\(\)"
-  color brightwhite "\.\.\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\(\)\.\."
-  # concatenar con funciones con cadena
-  color brightwhite "\.\.\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\(\".*\"\)"
-  color brightwhite "\.\.\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\(\".*\"\)\.\."
-
-  # concatenar al inicio
-  color brightwhite "\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\.\."
-   # concatenar con funciones con variables ó númericos
-   color brightwhite "\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\([a-Z_0-9\.]\)\.\."
-   # concatenar con funciones cerradas
-   color brightwhite "\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\(\)\.\."
-   # concatenar con funciones con cadena
-   color brightwhite "\<([a-Z_0-9\.]+|[a-Z_0-9\.]+\.[a-Z_0-9\.]+)\>\(\".*\"\)\.\."
-
-   # Comentarios simples
-   color brightred	"[[:blank:]]\/\/.*|^\/\/.*"
-   color brightred	"^#.*|[[:blank:]]#.*"
-
-   # Comentarios múltiples
-   color brightred	start="\/\*"	end="\*\/"
-
- #Valid colors are "green", "red", "blue",
- #"white", "yellow", "cyan", "magenta" and
- #"black", with the optional prefix "bright"
- #for foreground colors.
+# libbase.c
+color brightblue "\<(poner|poner|acadena|anumero|alogico|leer|limpiar|tipo)\>[(]+.*+[)]"
+color brightblue "\<(poner|poner|acadena|anumero|alogico|leer|limpiar|tipo)\>[[:space:]]+[(]+.*+[)]"
+color cyan "incluir+[(]+.*+[)]|incluir+[[:space:]]+[(]+.*+[)]"
+# libcast.c
+color brightblue "convertir\.\<(numerico|logico|cadena)\>[(]+.*+[)]"
+color brightblue "convertir\.\<(numerico|logico|cadena)\>[[:space:]]+[(]+.*+[)]"
+# latlist.c
+color brightblue "lista\.\<(invertir|agregar|extender|eliminar_indice|longitud|indice|comparar|insertar|eliminar|contiene)\>[(]+.*+[)]"
+color brightblue "lista\.\<(invertir|agregar|extender|eliminar_indice|longitud|indice|comparar|insertar|eliminar|contiene)\>[[:space:]]+[(]+.*+[)]"
+# libcurl.c
+color brightblue "curl\.\<(peticion|sinescape|escape)\>[(]+.*+[)]"
+color brightblue "curl\.\<(peticion|sinescape|escape)\>[[:space:]]+[(]+.*+[)]"
+# libjson.c
+color brightblue "json\.\<(decodificar|codificar)\>[(]+.*+[)]"
+color brightblue "json\.\<(decodificar|codificar)\>[[:space:]]+[(]+.*+[)]"
+# libgtk.c
+color brightblue "gtk\.\<(iniciar|menu|ventanaNueva|titulo|mostrarTodo|cajaNueva|agregar|ventanaMagnitud|botonTexto|botonDestruir|llamarFuncion)\>[(]+.*+[)]"
+color brightblue "gtk\.\<(iniciar|menu|ventanaNueva|titulo|mostrarTodo|cajaNueva|agregar|ventanaMagnitud|botonTexto|botonDestruir|llamarFuncion)\>[[:space:]]+[(]+.*+[)]"
+# libredis.c
+color brightblue "redis\.\<(conectar|desconectar|ping|asignar|hasignar|obtener|hobtener|borrar|hborrar|aumentar|haumentar|incrementar|hincrementar|hllaves|llaves|smiembros|sagregar|sborrar)\>[(]+.*+[)]"
+color brightblue "redis\.\<(conectar|desconectar|ping|asignar|hasignar|obtener|hobtener|borrar|hborrar|aumentar|haumentar|incrementar|hincrementar|hllaves|llaves|smiembros|sagregar|sborrar)\>[[:space:]]+[(]+.*+[)]"
+# libsys.c
+color brightblue "sis\.\<(dormir|ejecutar|pipe|fecha|salir|avisar|operativo|op)\>[(]+.*+[)]"
+color brightblue "sis\.\<(dormir|ejecutar|pipe|fecha|salir|avisar|operativo|op)\>[[:space:]]+[(]+.*+[)]"
+
+##################################################################
+
+# Numeros
+color brightyellow "\<([0-9]+)\>"
+# Operadores
+color yellow ":|\*|/|%|\+|-|\^|>|>=|<|=<|!=|=|&&|\|\|"
+# Simbolos
+color brightmagenta "(\(|\)|\[|\]|\{|\})"
+# Hexadecimales
+color brightgreen "0x[0-9a-fA-F]*"
+# Cierres de cadena
+color brightgreen	start="'" end="'"
+color brightgreen	start="\"" end="\""
+
+##################################################################
+
+# concatenar, despúes de... o antes de..
+color brightwhite "\.\.\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\.\."
+color brightwhite "\.\.\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>"
+# concatenar con funciones con variables ó númericos
+color brightwhite "\.\.\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\([a-zA-Z0-9\.]+\)"
+color brightwhite "\.\.\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\([a-zA-Z0-9\.]+\)\.\."
+# concatenar con funciones cerradas
+color brightwhite "\.\.\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\(\)"
+color brightwhite "\.\.\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\(\)\.\."
+# concatenar con funciones con cadena
+color brightwhite "\.\.\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\(\".*\"\)"
+color brightwhite "\.\.\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\(\".*\"\)\.\."
+
+# concatenar al inicio
+color brightwhite "\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\.\."
+# concatenar con funciones con variables ó númericos
+color brightwhite "\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\([a-zA-Z0-9\.]\)\.\."
+# concatenar con funciones cerradas
+color brightwhite "\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\(\)\.\."
+# concatenar con funciones con cadena
+color brightwhite "\<([a-zA-Z0-9\.]+|[a-zA-Z0-9\.]+\.[a-zA-Z0-9\.]+)\>\(\".*\"\)\.\."
+
+# Comentarios simples
+color brightred	"[[:blank:]]\/\/.*|^\/\/.*"
+color brightred	"^#.*|[[:blank:]]#.*"
+
+# Comentarios múltiples
+color brightred	start="\/\*"	end="\*\/"
+
+#Valid colors are "green", "red", "blue",
+#"white", "yellow", "cyan", "magenta" and
+#"black", with the optional prefix "bright"
+#for foreground colors.
\ No newline at end of file
diff --git a/src/latsyslib.c b/src/latsyslib.c
index 9b2d5e85..f5a0a8c4 100644
--- a/src/latsyslib.c
+++ b/src/latsyslib.c
@@ -177,6 +177,17 @@ static void latSO_usuario(lat_mv *mv) {
     latC_apilar(mv, tmp);
 }
 
+static void latSO_operativo(lat_mv *mv){
+    lat_objeto *o = latC_desapilar(mv);
+    lat_objeto *v = latO_falso;
+    char *os = latC_checar_cadena(mv, o);
+    char *ox = SISTEMAOPERATIVO;
+    if (strcmp(ox,os)==0){
+        v = latO_verdadero;
+    }
+    latC_apilar(mv, v);
+}
+
 /*
 void latSO_fork(lat_mv *mv) {
     bool pid_ok = false;
@@ -209,6 +220,8 @@ static const lat_CReg libsistema[] = {{"dormir", latSO_dormir, 1},
                                       {"iraxy", latSO_iraxy, 2},
                                       {"tiempo", latSO_tiempo, 2},
                                       {"usuario", latSO_usuario, 0},
+                                      {"operativo", latSO_operativo, 1},
+                                      {"op", latSO_operativo, 1},
                                       {NULL, NULL}};
 
 void latC_abrir_liblatino_syslib(lat_mv *mv) {
diff --git a/visualstudio/.vs/latino/v15/.suo b/visualstudio/.vs/latino/v15/.suo
new file mode 100644
index 00000000..960c292d
Binary files /dev/null and b/visualstudio/.vs/latino/v15/.suo differ
diff --git a/visualstudio/.vs/latino/v15/Browse.VC.db b/visualstudio/.vs/latino/v15/Browse.VC.db
new file mode 100644
index 00000000..fa3be3eb
Binary files /dev/null and b/visualstudio/.vs/latino/v15/Browse.VC.db differ
diff --git a/visualstudio/.vs/latino/v15/Solution.VC.db b/visualstudio/.vs/latino/v15/Solution.VC.db
new file mode 100644
index 00000000..c3caca77
Binary files /dev/null and b/visualstudio/.vs/latino/v15/Solution.VC.db differ
diff --git a/visualstudio/ALL_BUILD.vcxproj b/visualstudio/ALL_BUILD.vcxproj
index cffd5c3a..be831cc5 100644
--- a/visualstudio/ALL_BUILD.vcxproj
+++ b/visualstudio/ALL_BUILD.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>ALL_BUILD</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,12 +109,21 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -74,7 +133,11 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -84,7 +147,11 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -94,7 +161,11 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -105,10 +176,17 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\CMakeLists.txt">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Custom Rule C:/Users/ciber/src/latino/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/CMakeFiles/generate.stamp
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\CMakeLists.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -116,12 +194,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/CMakeLists.txt;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\Users\ciber\src\latino\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Custom Rule C:/Users/ciber/src/latino/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -129,12 +216,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/CMakeLists.txt;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\Users\ciber\src\latino\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">Building Custom Rule C:/Users/ciber/src/latino/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -142,12 +238,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/CMakeLists.txt;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\Users\ciber\src\latino\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">Building Custom Rule C:/Users/ciber/src/latino/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -155,20 +260,32 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/CMakeLists.txt;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\Users\ciber\src\latino\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\src\latino.vcxproj">
       <Project>{3F82360A-D8B2-3FE8-B428-8826B0B28EC9}</Project>
       <Name>latino</Name>
@@ -198,6 +315,27 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <Name>regex2</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\src\latino.vcxproj">
+      <Project>{E1065E73-2BBA-3561-A086-AAA096B77256}</Project>
+      <Name>latino</Name>
+    </ProjectReference>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\src\liblatino.vcxproj">
+      <Project>{F911F51A-B91F-3AE3-97AD-79478CA29940}</Project>
+      <Name>liblatino</Name>
+    </ProjectReference>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\src\liblatino_static.vcxproj">
+      <Project>{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}</Project>
+      <Name>liblatino_static</Name>
+    </ProjectReference>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\linenoise.vcxproj">
+      <Project>{B90DCFE9-12E8-3B69-A0DC-10325F593B61}</Project>
+      <Name>linenoise</Name>
+    </ProjectReference>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\regex2.vcxproj">
+      <Project>{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}</Project>
+      <Name>regex2</Name>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/visualstudio/ALL_BUILD.vcxproj.filters b/visualstudio/ALL_BUILD.vcxproj.filters
index 0f982c25..12141384 100644
--- a/visualstudio/ALL_BUILD.vcxproj.filters
+++ b/visualstudio/ALL_BUILD.vcxproj.filters
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\CMakeLists.txt" />
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\CMakeLists.txt" />
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>
diff --git a/visualstudio/ALL_BUILD.vcxproj.user b/visualstudio/ALL_BUILD.vcxproj.user
index 88a55094..5d91b890 100644
--- a/visualstudio/ALL_BUILD.vcxproj.user
+++ b/visualstudio/ALL_BUILD.vcxproj.user
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   <PropertyGroup />
 </Project>
\ No newline at end of file
diff --git a/visualstudio/PACKAGE.vcxproj b/visualstudio/PACKAGE.vcxproj
index 4860bf40..55c46773 100644
--- a/visualstudio/PACKAGE.vcxproj
+++ b/visualstudio/PACKAGE.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FBBB5B2A-E916-3548-8422-48CC98F1697E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>PACKAGE</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,12 +109,21 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -74,6 +133,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <PostBuildEvent>
+<<<<<<< HEAD
       <Message></Message>
       <Command>setlocal
 cd C:\Users\ciber\src\latino\visualstudio
@@ -81,6 +141,16 @@ if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+      <Message>
+      </Message>
+      <Command>setlocal
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -90,7 +160,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -100,6 +174,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <PostBuildEvent>
+<<<<<<< HEAD
       <Message></Message>
       <Command>setlocal
 cd C:\Users\ciber\src\latino\visualstudio
@@ -107,6 +182,16 @@ if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+      <Message>
+      </Message>
+      <Command>setlocal
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -116,7 +201,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -126,6 +215,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <PostBuildEvent>
+<<<<<<< HEAD
       <Message></Message>
       <Command>setlocal
 cd C:\Users\ciber\src\latino\visualstudio
@@ -133,6 +223,16 @@ if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+      <Message>
+      </Message>
+      <Command>setlocal
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -142,7 +242,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -152,6 +256,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <PostBuildEvent>
+<<<<<<< HEAD
       <Message></Message>
       <Command>setlocal
 cd C:\Users\ciber\src\latino\visualstudio
@@ -159,6 +264,16 @@ if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+      <Message>
+      </Message>
+      <Command>setlocal
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -169,9 +284,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\9a3ed06bee62762c26a2682444bb6b3c\PACKAGE_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2a0a5f1f16ba44763e4e75d6baaec2cd\PACKAGE_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -180,11 +302,20 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -193,11 +324,20 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -206,11 +346,20 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -219,6 +368,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -227,12 +377,27 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ALL_BUILD.vcxproj">
       <Project>{F40FC4C3-982F-3C83-A595-41DF3D362576}</Project>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ALL_BUILD.vcxproj">
+      <Project>{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ALL_BUILD</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/PACKAGE.vcxproj.filters b/visualstudio/PACKAGE.vcxproj.filters
index 971e6e02..a3ca2e49 100644
--- a/visualstudio/PACKAGE.vcxproj.filters
+++ b/visualstudio/PACKAGE.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\9a3ed06bee62762c26a2682444bb6b3c\PACKAGE_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2a0a5f1f16ba44763e4e75d6baaec2cd\PACKAGE_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/PACKAGE.vcxproj.user b/visualstudio/PACKAGE.vcxproj.user
new file mode 100644
index 00000000..be250787
--- /dev/null
+++ b/visualstudio/PACKAGE.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/visualstudio/RUN_TESTS.vcxproj b/visualstudio/RUN_TESTS.vcxproj
index cccb60e4..1d3cdf1a 100644
--- a/visualstudio/RUN_TESTS.vcxproj
+++ b/visualstudio/RUN_TESTS.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BE9D3145-B359-3E69-AC76-EE107F52BEB5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>RUN_TESTS</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,12 +109,21 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -74,9 +133,16 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <PostBuildEvent>
+<<<<<<< HEAD
       <Message></Message>
       <Command>setlocal
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+      <Message>
+      </Message>
+      <Command>setlocal
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -86,7 +152,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -96,9 +166,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <PostBuildEvent>
+<<<<<<< HEAD
       <Message></Message>
       <Command>setlocal
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+      <Message>
+      </Message>
+      <Command>setlocal
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -108,7 +185,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -118,9 +199,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <PostBuildEvent>
+<<<<<<< HEAD
       <Message></Message>
       <Command>setlocal
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+      <Message>
+      </Message>
+      <Command>setlocal
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -130,7 +218,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -140,9 +232,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <PostBuildEvent>
+<<<<<<< HEAD
       <Message></Message>
       <Command>setlocal
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+      <Message>
+      </Message>
+      <Command>setlocal
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -153,9 +252,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\9a3ed06bee62762c26a2682444bb6b3c\RUN_TESTS_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2a0a5f1f16ba44763e4e75d6baaec2cd\RUN_TESTS_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -164,11 +270,20 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -177,11 +292,20 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -190,11 +314,20 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -203,6 +336,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -211,6 +345,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/RUN_TESTS.vcxproj.filters b/visualstudio/RUN_TESTS.vcxproj.filters
index 819b9cda..43147b44 100644
--- a/visualstudio/RUN_TESTS.vcxproj.filters
+++ b/visualstudio/RUN_TESTS.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\9a3ed06bee62762c26a2682444bb6b3c\RUN_TESTS_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2a0a5f1f16ba44763e4e75d6baaec2cd\RUN_TESTS_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/RUN_TESTS.vcxproj.user b/visualstudio/RUN_TESTS.vcxproj.user
new file mode 100644
index 00000000..be250787
--- /dev/null
+++ b/visualstudio/RUN_TESTS.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.log b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.log
new file mode 100644
index 00000000..6b2c5624
--- /dev/null
+++ b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.log
@@ -0,0 +1 @@
+  Building Custom Rule C:/Users/Layout/Desktop/Latino/CMakeLists.txt
diff --git a/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/ALL_BUILD.lastbuildstate b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/ALL_BUILD.lastbuildstate
new file mode 100644
index 00000000..cd2eedc2
--- /dev/null
+++ b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/ALL_BUILD.lastbuildstate
@@ -0,0 +1,2 @@
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
+Debug|Win32|C:\Users\Layout\Desktop\Latino\visualstudio\|
diff --git a/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/custombuild.command.1.tlog b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/custombuild.command.1.tlog
new file mode 100644
index 00000000..004dd7d4
Binary files /dev/null and b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/custombuild.command.1.tlog differ
diff --git a/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/custombuild.read.1.tlog b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/custombuild.read.1.tlog
new file mode 100644
index 00000000..a3b68e58
Binary files /dev/null and b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/custombuild.read.1.tlog differ
diff --git a/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/custombuild.write.1.tlog b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/custombuild.write.1.tlog
new file mode 100644
index 00000000..6bd0aac9
Binary files /dev/null and b/visualstudio/Win32/Debug/ALL_BUILD/ALL_BUILD.tlog/custombuild.write.1.tlog differ
diff --git a/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.log b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.log
new file mode 100644
index 00000000..de90f20f
--- /dev/null
+++ b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.log
@@ -0,0 +1 @@
+  Checking Build System
diff --git a/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/ZERO_CHECK.lastbuildstate b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/ZERO_CHECK.lastbuildstate
new file mode 100644
index 00000000..cd2eedc2
--- /dev/null
+++ b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/ZERO_CHECK.lastbuildstate
@@ -0,0 +1,2 @@
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
+Debug|Win32|C:\Users\Layout\Desktop\Latino\visualstudio\|
diff --git a/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/custombuild.command.1.tlog b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/custombuild.command.1.tlog
new file mode 100644
index 00000000..3871a3a3
Binary files /dev/null and b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/custombuild.command.1.tlog differ
diff --git a/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/custombuild.read.1.tlog b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/custombuild.read.1.tlog
new file mode 100644
index 00000000..3f447046
Binary files /dev/null and b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/custombuild.read.1.tlog differ
diff --git a/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/custombuild.write.1.tlog b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/custombuild.write.1.tlog
new file mode 100644
index 00000000..a8b304bd
Binary files /dev/null and b/visualstudio/Win32/Debug/ZERO_CHECK/ZERO_CHECK.tlog/custombuild.write.1.tlog differ
diff --git a/visualstudio/ZERO_CHECK.vcxproj b/visualstudio/ZERO_CHECK.vcxproj
index 1e27d38c..e6c27e90 100644
--- a/visualstudio/ZERO_CHECK.vcxproj
+++ b/visualstudio/ZERO_CHECK.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>ZERO_CHECK</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,12 +109,21 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -74,7 +133,11 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -84,7 +147,11 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -94,7 +161,11 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -105,10 +176,17 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\9a3ed06bee62762c26a2682444bb6b3c\generate.stamp.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Checking Build System</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file C:/Users/ciber/src/latino/visualstudio/latino.sln
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2a0a5f1f16ba44763e4e75d6baaec2cd\generate.stamp.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Checking Build System</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file C:/Users/Layout/Desktop/Latino/visualstudio/latino.sln
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -116,12 +194,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/generate.stamp.rule;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Checking Build System</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file C:/Users/ciber/src/latino/visualstudio/latino.sln
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\linenoise\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Checking Build System</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file C:/Users/Layout/Desktop/Latino/visualstudio/latino.sln
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -129,12 +216,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/generate.stamp.rule;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">Checking Build System</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file C:/Users/ciber/src/latino/visualstudio/latino.sln
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\linenoise\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">Checking Build System</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file C:/Users/Layout/Desktop/Latino/visualstudio/latino.sln
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -142,12 +238,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/generate.stamp.rule;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">Checking Build System</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file C:/Users/ciber/src/latino/visualstudio/latino.sln
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\linenoise\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">Checking Build System</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file C:/Users/Layout/Desktop/Latino/visualstudio/latino.sln
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -155,9 +260,15 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/generate.stamp.rule;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\generate.stamp;C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\linenoise\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\generate.stamp;C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff --git a/visualstudio/ZERO_CHECK.vcxproj.filters b/visualstudio/ZERO_CHECK.vcxproj.filters
index eb218cbd..08981e89 100644
--- a/visualstudio/ZERO_CHECK.vcxproj.filters
+++ b/visualstudio/ZERO_CHECK.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\9a3ed06bee62762c26a2682444bb6b3c\generate.stamp.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2a0a5f1f16ba44763e4e75d6baaec2cd\generate.stamp.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/ZERO_CHECK.vcxproj.user b/visualstudio/ZERO_CHECK.vcxproj.user
new file mode 100644
index 00000000..be250787
--- /dev/null
+++ b/visualstudio/ZERO_CHECK.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/visualstudio/coverage.vcxproj b/visualstudio/coverage.vcxproj
index 106332c8..2f68761f 100644
--- a/visualstudio/coverage.vcxproj
+++ b/visualstudio/coverage.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6D23803B-9A51-3300-906E-688D84932CE7}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>coverage</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,12 +109,21 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -74,7 +133,11 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -84,7 +147,11 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -94,7 +161,11 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -105,10 +176,18 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\9a3ed06bee62762c26a2682444bb6b3c\coverage.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 cd C:\Users\ciber\src\latino\visualstudio
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2a0a5f1f16ba44763e4e75d6baaec2cd\coverage.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
@@ -126,12 +205,22 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/coverage.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\coverage</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
 cd C:\Users\ciber\src\latino\visualstudio
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\coverage</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
@@ -149,12 +238,22 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/coverage.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\coverage</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
 cd C:\Users\ciber\src\latino\visualstudio
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\coverage</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
@@ -172,12 +271,22 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/coverage.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\coverage</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
 cd C:\Users\ciber\src\latino\visualstudio
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\coverage</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
@@ -195,6 +304,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/9a3ed06bee62762c26a2682444bb6b3c/coverage.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\coverage</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -205,6 +315,18 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Custom Rule C:/Users/ciber/src/latino/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\coverage</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\CMakeLists.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -212,12 +334,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/CMakeLists.txt;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\Users\ciber\src\latino\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Custom Rule C:/Users/ciber/src/latino/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -225,12 +356,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/CMakeLists.txt;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\Users\ciber\src\latino\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">Building Custom Rule C:/Users/ciber/src/latino/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -238,12 +378,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/CMakeLists.txt;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\Users\ciber\src\latino\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">Building Custom Rule C:/Users/ciber/src/latino/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -251,6 +400,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/CMakeLists.txt;C:\Users\ciber\src\latino\CMakeLists.txt;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeCXXCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeRCCompiler.cmake;C:\Users\ciber\src\latino\visualstudio\CMakeFiles\3.14.0\CMakeSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCXXInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeCommonLanguageInclude.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeGenericSystem.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeInitializeConfigs.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeLanguageInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeRCInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInformation.cmake;C:\bin\CMake\share\cmake-3.14\Modules\CMakeSystemSpecificInitialize.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Compiler\MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-C.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC-CXX.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows-MSVC.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\Windows.cmake;C:\bin\CMake\share\cmake-3.14\Modules\Platform\WindowsPaths.cmake;C:\Users\ciber\src\latino\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -262,6 +412,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCCompilerABI.c;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXCompilerABI.cpp;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCXXInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeCompilerIdDetection.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompileFeatures.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerABI.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineCompilerId.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeDetermineSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeFindBinUtils.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeLanguageInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitIncludeInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeParseImplicitLinkInfo.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCCompiler.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeRCInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystem.cmake.in;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCXXCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestCompilerCommon.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CMakeTestRCCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ADSP-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMCC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\ARMClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\AppleClang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Borland-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Bruce-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\CMakeCommonCompilerMacros.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Clang-DetermineCompilerInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Comeau-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Compaq-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Cray-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Embarcadero-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Fujitsu-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GHS-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\GNU-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\HP-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IAR-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-C-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\IBMCPP-CXX-DetermineVersionInternal.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Intel-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\MSVC-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\NVIDIA-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\OpenWatcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PGI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\PathScale-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SCO-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SDCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\SunPro-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TI-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\TinyCC-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\VisualAge-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\Watcom-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XL-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\XLClang-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-C-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Compiler\zOS-CXX-DetermineCompiler.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\CompilerId\VS-10.vcxproj.in;C:\Program Files\CMake\share\cmake-3.16\Modules\Internal\FeatureTesting.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-Determine-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows-MSVC.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.16\Modules\Platform\WindowsPaths.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeCXXCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeRCCompiler.cmake;C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\3.16.4\CMakeSystem.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\coverage" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/coverage.vcxproj.filters b/visualstudio/coverage.vcxproj.filters
index b3fe84c1..0a7bff31 100644
--- a/visualstudio/coverage.vcxproj.filters
+++ b/visualstudio/coverage.vcxproj.filters
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\9a3ed06bee62762c26a2682444bb6b3c\coverage.rule">
@@ -12,6 +13,21 @@
   <ItemGroup>
     <Filter Include="CMake Rules">
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2a0a5f1f16ba44763e4e75d6baaec2cd\coverage.rule">
+      <Filter>CMake Rules</Filter>
+    </CustomBuild>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\coverage" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="CMake Rules">
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/latino.sln b/visualstudio/latino.sln
index 655a8529..854058e5 100644
--- a/visualstudio/latino.sln
+++ b/visualstudio/latino.sln
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 16
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{F40FC4C3-982F-3C83-A595-41DF3D362576}"
@@ -56,10 +57,71 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex2", "src\regex-2.7-src\src\regex2.vcxproj", "{97EC7075-DCF4-3099-91A0-7E53969691D7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EFC1E963-EF0A-336A-AFBC-9542D6B04179} = {EFC1E963-EF0A-336A-AFBC-9542D6B04179}
+=======
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5} = {028B1569-BCE1-3C7C-A3AC-45D14029C3D5}
+		{E1065E73-2BBA-3561-A086-AAA096B77256} = {E1065E73-2BBA-3561-A086-AAA096B77256}
+		{F911F51A-B91F-3AE3-97AD-79478CA29940} = {F911F51A-B91F-3AE3-97AD-79478CA29940}
+		{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE} = {4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}
+		{B90DCFE9-12E8-3B69-A0DC-10325F593B61} = {B90DCFE9-12E8-3B69-A0DC-10325F593B61}
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5} = {DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PACKAGE", "PACKAGE.vcxproj", "{FBBB5B2A-E916-3548-8422-48CC98F1697E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8} = {05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5} = {028B1569-BCE1-3C7C-A3AC-45D14029C3D5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RUN_TESTS", "RUN_TESTS.vcxproj", "{BE9D3145-B359-3E69-AC76-EE107F52BEB5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5} = {028B1569-BCE1-3C7C-A3AC-45D14029C3D5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "ZERO_CHECK.vcxproj", "{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coverage", "coverage.vcxproj", "{6D23803B-9A51-3300-906E-688D84932CE7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5} = {028B1569-BCE1-3C7C-A3AC-45D14029C3D5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "latino", "src\latino.vcxproj", "{E1065E73-2BBA-3561-A086-AAA096B77256}"
+	ProjectSection(ProjectDependencies) = postProject
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5} = {028B1569-BCE1-3C7C-A3AC-45D14029C3D5}
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5} = {DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblatino", "src\liblatino.vcxproj", "{F911F51A-B91F-3AE3-97AD-79478CA29940}"
+	ProjectSection(ProjectDependencies) = postProject
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5} = {028B1569-BCE1-3C7C-A3AC-45D14029C3D5}
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5} = {DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblatino_static", "src\liblatino_static.vcxproj", "{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5} = {028B1569-BCE1-3C7C-A3AC-45D14029C3D5}
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5} = {DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linenoise", "src\linenoise\linenoise.vcxproj", "{B90DCFE9-12E8-3B69-A0DC-10325F593B61}"
+	ProjectSection(ProjectDependencies) = postProject
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5} = {028B1569-BCE1-3C7C-A3AC-45D14029C3D5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex2", "src\regex-2.7-src\src\regex2.vcxproj", "{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5} = {028B1569-BCE1-3C7C-A3AC-45D14029C3D5}
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+<<<<<<< HEAD
 		Debug|x64 = Debug|x64
 		Release|x64 = Release|x64
 		MinSizeRel|x64 = MinSizeRel|x64
@@ -137,6 +199,85 @@ Global
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7B0C08EC-42FB-3DC3-BF07-FDB85466E573}
+=======
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+		MinSizeRel|Win32 = MinSizeRel|Win32
+		RelWithDebInfo|Win32 = RelWithDebInfo|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}.Debug|Win32.Build.0 = Debug|Win32
+		{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}.Release|Win32.ActiveCfg = Release|Win32
+		{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}.Release|Win32.Build.0 = Release|Win32
+		{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{FBBB5B2A-E916-3548-8422-48CC98F1697E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FBBB5B2A-E916-3548-8422-48CC98F1697E}.Release|Win32.ActiveCfg = Release|Win32
+		{FBBB5B2A-E916-3548-8422-48CC98F1697E}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{FBBB5B2A-E916-3548-8422-48CC98F1697E}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{BE9D3145-B359-3E69-AC76-EE107F52BEB5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BE9D3145-B359-3E69-AC76-EE107F52BEB5}.Release|Win32.ActiveCfg = Release|Win32
+		{BE9D3145-B359-3E69-AC76-EE107F52BEB5}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{BE9D3145-B359-3E69-AC76-EE107F52BEB5}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}.Debug|Win32.Build.0 = Debug|Win32
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}.Release|Win32.ActiveCfg = Release|Win32
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}.Release|Win32.Build.0 = Release|Win32
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{6D23803B-9A51-3300-906E-688D84932CE7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D23803B-9A51-3300-906E-688D84932CE7}.Release|Win32.ActiveCfg = Release|Win32
+		{6D23803B-9A51-3300-906E-688D84932CE7}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{6D23803B-9A51-3300-906E-688D84932CE7}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{E1065E73-2BBA-3561-A086-AAA096B77256}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E1065E73-2BBA-3561-A086-AAA096B77256}.Debug|Win32.Build.0 = Debug|Win32
+		{E1065E73-2BBA-3561-A086-AAA096B77256}.Release|Win32.ActiveCfg = Release|Win32
+		{E1065E73-2BBA-3561-A086-AAA096B77256}.Release|Win32.Build.0 = Release|Win32
+		{E1065E73-2BBA-3561-A086-AAA096B77256}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{E1065E73-2BBA-3561-A086-AAA096B77256}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{E1065E73-2BBA-3561-A086-AAA096B77256}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{E1065E73-2BBA-3561-A086-AAA096B77256}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{F911F51A-B91F-3AE3-97AD-79478CA29940}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F911F51A-B91F-3AE3-97AD-79478CA29940}.Debug|Win32.Build.0 = Debug|Win32
+		{F911F51A-B91F-3AE3-97AD-79478CA29940}.Release|Win32.ActiveCfg = Release|Win32
+		{F911F51A-B91F-3AE3-97AD-79478CA29940}.Release|Win32.Build.0 = Release|Win32
+		{F911F51A-B91F-3AE3-97AD-79478CA29940}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{F911F51A-B91F-3AE3-97AD-79478CA29940}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{F911F51A-B91F-3AE3-97AD-79478CA29940}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{F911F51A-B91F-3AE3-97AD-79478CA29940}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}.Debug|Win32.Build.0 = Debug|Win32
+		{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}.Release|Win32.ActiveCfg = Release|Win32
+		{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}.Release|Win32.Build.0 = Release|Win32
+		{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{B90DCFE9-12E8-3B69-A0DC-10325F593B61}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B90DCFE9-12E8-3B69-A0DC-10325F593B61}.Debug|Win32.Build.0 = Debug|Win32
+		{B90DCFE9-12E8-3B69-A0DC-10325F593B61}.Release|Win32.ActiveCfg = Release|Win32
+		{B90DCFE9-12E8-3B69-A0DC-10325F593B61}.Release|Win32.Build.0 = Release|Win32
+		{B90DCFE9-12E8-3B69-A0DC-10325F593B61}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{B90DCFE9-12E8-3B69-A0DC-10325F593B61}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{B90DCFE9-12E8-3B69-A0DC-10325F593B61}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{B90DCFE9-12E8-3B69-A0DC-10325F593B61}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}.Debug|Win32.Build.0 = Debug|Win32
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}.Release|Win32.ActiveCfg = Release|Win32
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}.Release|Win32.Build.0 = Release|Win32
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8BB9D838-2E27-3FE8-98BD-8F586F1F2111}
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 	EndGlobalSection
 	GlobalSection(ExtensibilityAddIns) = postSolution
 	EndGlobalSection
diff --git a/visualstudio/src/Debug/latino.dll b/visualstudio/src/Debug/latino.dll
new file mode 100644
index 00000000..033d7e9b
Binary files /dev/null and b/visualstudio/src/Debug/latino.dll differ
diff --git a/visualstudio/src/PACKAGE.vcxproj b/visualstudio/src/PACKAGE.vcxproj
index 734254cc..eb2d0923 100644
--- a/visualstudio/src/PACKAGE.vcxproj
+++ b/visualstudio/src/PACKAGE.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -26,10 +27,36 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FBBB5B2A-E916-3548-8422-48CC98F1697E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <ProjectName>PACKAGE</ProjectName>
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+<<<<<<< HEAD
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -49,6 +76,27 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +107,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
@@ -67,6 +116,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -76,11 +135,19 @@
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -90,9 +157,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -102,11 +175,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -116,9 +197,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -128,11 +215,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -142,9 +237,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -154,11 +255,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -169,9 +278,15 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\59c105e1958116b3d21fe8b8349ff665\PACKAGE_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2834c9ac51a4b1dc2a570e5e48598a73\PACKAGE_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -180,11 +295,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/59c105e1958116b3d21fe8b8349ff665/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -193,11 +316,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/59c105e1958116b3d21fe8b8349ff665/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -206,11 +337,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/59c105e1958116b3d21fe8b8349ff665/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -219,6 +358,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/59c105e1958116b3d21fe8b8349ff665/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -227,12 +367,27 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ALL_BUILD.vcxproj">
       <Project>{F40FC4C3-982F-3C83-A595-41DF3D362576}</Project>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ALL_BUILD.vcxproj">
+      <Project>{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ALL_BUILD</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/PACKAGE.vcxproj.filters b/visualstudio/src/PACKAGE.vcxproj.filters
index d0913d50..2806ae1a 100644
--- a/visualstudio/src/PACKAGE.vcxproj.filters
+++ b/visualstudio/src/PACKAGE.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\59c105e1958116b3d21fe8b8349ff665\PACKAGE_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2834c9ac51a4b1dc2a570e5e48598a73\PACKAGE_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/RUN_TESTS.vcxproj b/visualstudio/src/RUN_TESTS.vcxproj
index d0d86b6a..201317f6 100644
--- a/visualstudio/src/RUN_TESTS.vcxproj
+++ b/visualstudio/src/RUN_TESTS.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -26,10 +27,36 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BE9D3145-B359-3E69-AC76-EE107F52BEB5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <ProjectName>RUN_TESTS</ProjectName>
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+<<<<<<< HEAD
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -49,6 +76,27 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +107,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
@@ -67,6 +116,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -76,7 +135,11 @@
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -86,9 +149,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -98,7 +167,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -108,9 +181,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -120,7 +199,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -130,9 +213,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -142,7 +231,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -153,9 +246,15 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\59c105e1958116b3d21fe8b8349ff665\RUN_TESTS_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2834c9ac51a4b1dc2a570e5e48598a73\RUN_TESTS_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -164,11 +263,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/59c105e1958116b3d21fe8b8349ff665/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -177,11 +284,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/59c105e1958116b3d21fe8b8349ff665/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -190,11 +305,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/59c105e1958116b3d21fe8b8349ff665/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -203,6 +326,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/59c105e1958116b3d21fe8b8349ff665/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -211,6 +335,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/RUN_TESTS.vcxproj.filters b/visualstudio/src/RUN_TESTS.vcxproj.filters
index 73bee399..eabd7f12 100644
--- a/visualstudio/src/RUN_TESTS.vcxproj.filters
+++ b/visualstudio/src/RUN_TESTS.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\59c105e1958116b3d21fe8b8349ff665\RUN_TESTS_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\2834c9ac51a4b1dc2a570e5e48598a73\RUN_TESTS_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/latino.dir/Debug/latino.log b/visualstudio/src/latino.dir/Debug/latino.log
index a6ff9e78..da4af45a 100644
--- a/visualstudio/src/latino.dir/Debug/latino.log
+++ b/visualstudio/src/latino.dir/Debug/latino.log
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
   Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt
   CMake does not need to re-run because C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp is up-to-date.
   Compilador de optimización de C/C++ de Microsoft (R) versión 19.21.27702.2 para x64
@@ -8,3 +9,256 @@ C:\Users\ciber\src\latino\include\latino.h(58,9): warning C4068:  pragma descono
 C:\Users\ciber\src\latino\src\latbaselib.c(199,1): warning C4267:  'inicializando': conversión de 'size_t' a 'int'; posible pérdida de datos
 C:\Users\ciber\src\latino\src\latbaselib.c(216,34): warning C4100:  'mv': parámetro formal sin referencia
   latino.vcxproj -> C:\Users\ciber\src\latino\visualstudio\src\Debug\latino.exe
+=======
+  Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt
+  Microsoft (R) C/C++ Optimizing Compiler Version 19.16.27038 for x86
+  Copyright (C) Microsoft Corporation.  All rights reserved.
+  
+  cl /c /I"C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src" /IC:\Users\Layout\Desktop\Latino\src\linenoise /IC:\Users\Layout\Desktop\Latino\src\..\include /Zi /W4 /WX- /diagnostics:classic /Od /Ob0 /Oy- /D WIN32 /D _WINDOWS /D _CRT_SECURE_NO_WARNINGS /D _DEBUG /D __STDC_CONSTANT_MACROS /D __STDC_FORMAT_MACROS /D __STDC_LIMIT_MACROS /D "CMAKE_INTDIR=\"Debug\"" /D _MBCS /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"latino.dir\Debug\\" /Fd"latino.dir\Debug\vc141.pdb" /Gd /TC /analyze- /errorReport:prompt C:\Users\Layout\Desktop\Latino\src\latino.c C:\Users\Layout\Desktop\Latino\src\latlex.c C:\Users\Layout\Desktop\Latino\src\latparse.c C:\Users\Layout\Desktop\Latino\src\latast.c C:\Users\Layout\Desktop\Latino\src\latmem.c C:\Users\Layout\Desktop\Latino\src\latdic.c C:\Users\Layout\Desktop\Latino\src\latdo.c C:\Users\Layout\Desktop\Latino\src\latlist.c C:\Users\Layout\Desktop\Latino\src\latmv.c C:\Users\Layout\Desktop\Latino\src\latobj.c C:\Users\Layout\Desktop\Latino\src\latpaqlib.c C:\Users\Layout\Desktop\Latino\src\latrepl.c C:\Users\Layout\Desktop\Latino\src\latgc.c C:\Users\Layout\Desktop\Latino\src\latbaselib.c C:\Users\Layout\Desktop\Latino\src\latstrlib.c C:\Users\Layout\Desktop\Latino\src\latlistlib.c C:\Users\Layout\Desktop\Latino\src\latdiclib.c C:\Users\Layout\Desktop\Latino\src\latfilelib.c C:\Users\Layout\Desktop\Latino\src\latmathlib.c C:\Users\Layout\Desktop\Latino\src\latsyslib.c C:\Users\Layout\Desktop\Latino\src\latdevlib.c C:\Users\Layout\Desktop\Latino\src\linenoise\utf8.c C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c
+  
+  latino.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latino.c(119): warning C4456: declaration of 'i' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\latino.c(81): note: see declaration of 'i'
+  latlex.c
+  latparse.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+latparse.c(1535): warning C4244: '=': conversion from 'int' to 'yytype_int16', possible loss of data
+latparse.c(2468): warning C4127: conditional expression is constant
+latparse.y(468): warning C4100: 'root': unreferenced formal parameter
+latparse.y(468): warning C4100: 'scanner': unreferenced formal parameter
+  latast.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latmem.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latdic.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latdo.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latdo.c(708): warning C4002: too many arguments for function-like macro invocation 'snprintf'
+C:\Users\Layout\Desktop\Latino\src\latdo.c(707): warning C4473: '_snprintf' : not enough arguments passed for format string
+  C:\Users\Layout\Desktop\Latino\src\latdo.c(707): note: placeholders and their parameters expect 4 variadic arguments, but 1 were provided
+  C:\Users\Layout\Desktop\Latino\src\latdo.c(707): note: the missing variadic argument 2 is required by format string '%d'
+  latlist.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latmv.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latmv.c(291): warning C4100: 'ctx': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\latmv.c(532): warning C4244: '=': conversion from 'int' to 'lat_byte', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(964): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(990): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1010): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1014): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1024): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1091): warning C4456: declaration of 'cur' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\latmv.c(552): note: see declaration of 'cur'
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1113): warning C4018: '>': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1116): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(947): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1019): warning C4204: nonstandard extension used: non-constant aggregate initializer
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1029): warning C4204: nonstandard extension used: non-constant aggregate initializer
+  latobj.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latobj.c(116): warning C4018: '>': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latobj.c(319): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(730): warning C4244: 'return': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(733): warning C4244: 'return': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(759): warning C4244: 'return': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(762): warning C4244: 'return': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(772): warning C4244: 'return': conversion from 'double' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(775): warning C4244: 'return': conversion from 'double' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(779): warning C4244: 'return': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(782): warning C4267: 'return': conversion from 'size_t' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(803): warning C4047: 'return': 'char *' differs in levels of indirection from 'char'
+  latpaqlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latrepl.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latgc.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latgc.c(102): warning C4100: 'mv': unreferenced formal parameter
+  latbaselib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latbaselib.c(216): warning C4100: 'mv': unreferenced formal parameter
+  latstrlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(32): warning C4244: '+=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(88): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(94): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(118): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(137): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(141): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(145): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(151): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(164): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(324): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(335): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(447): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(466): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(477): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(563): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(564): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(594): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(595): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(635): warning C4018: '<': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(931): warning C4018: '<': signed/unsigned mismatch
+  latlistlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latlistlib.c(56): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latlistlib.c(101): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latlistlib.c(139): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+  latdiclib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latfilelib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(35): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(38): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(41): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(48): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+  latmathlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(165): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(166): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(170): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(171): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(173): warning C4244: 'function': conversion from 'time_t' to 'unsigned int', possible loss of data
+  latsyslib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(62): warning C4244: 'function': conversion from 'double' to 'DWORD', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(115): warning C4244: 'function': conversion from 'time_t' to 'double', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(119): warning C4244: '=': conversion from 'double' to 'time_t', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(140): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(149): warning C4100: 'mv': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(164): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+  Generating Code...
+c:\users\layout\desktop\latino\src\latstrlib.c(301): warning C4706: assignment within conditional expression
+c:\users\layout\desktop\latino\src\latstrlib.c(551): warning C4702: unreachable code
+c:\users\layout\desktop\latino\src\latmv.c(148): warning C4702: unreachable code
+c:\users\layout\desktop\latino\src\latmv.c(192): warning C4702: unreachable code
+c:\users\layout\desktop\latino\visualstudio\src\latparse.c(2419): warning C4702: unreachable code
+c:\users\layout\desktop\latino\visualstudio\src\latparse.c(2424): warning C4702: unreachable code
+c:\users\layout\desktop\latino\visualstudio\src\latparse.c(2425): warning C4702: unreachable code
+  Compiling...
+  latdevlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  utf8.c
+  linenoise.c
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(733): warning C4100: 'prompt': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(761): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(851): warning C4456: declaration of 'ch' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(789): note: see declaration of 'ch'
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(864): warning C4244: 'function': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(1230): warning C4456: declaration of 'p' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(1220): note: see declaration of 'p'
+  Generating Code...
+     Creating library C:/Users/Layout/Desktop/Latino/visualstudio/src/Debug/latino.lib and object C:/Users/Layout/Desktop/Latino/visualstudio/src/Debug/latino.exp
+latino.obj : warning LNK4217: locally defined symbol _latC_crear_mv imported in function _main
+latdiclib.obj : warning LNK4217: locally defined symbol _latC_apilar imported in function _dic_longitud
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_apilar imported in function _file_leerlinea
+latmathlib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latino.obj : warning LNK4217: locally defined symbol _latC_apilar imported in function _main
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_analizar imported in function _file_leerlinea
+latino.obj : warning LNK4217: locally defined symbol _latC_analizar imported in function _main
+latrepl.obj : warning LNK4217: locally defined symbol _latC_analizar imported in function _completion
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_analizar imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_analizar imported
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_llamar_funcion imported in function _file_leerlinea
+latino.obj : warning LNK4217: locally defined symbol _latC_llamar_funcion imported in function _main
+latrepl.obj : warning LNK4217: locally defined symbol _latC_llamar_funcion imported in function _leer_linea
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_llamar_funcion imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_llamar_funcion imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latmathlib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latino.obj : warning LNK4217: locally defined symbol _latC_crear_numerico imported in function _main
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latfilelib.obj : warning LNK4049: locally defined symbol _latC_crear_cadena imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_crear_cadena imported
+latino.obj : warning LNK4217: locally defined symbol _latC_crear_cadena imported in function _main
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_crear_cadena imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_crear_cadena imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_crear_cadena imported
+latino.obj : warning LNK4217: locally defined symbol _latC_crear_funcion imported in function _main
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_checar_lista imported in function _file_leerlinea
+latino.obj : warning LNK4217: locally defined symbol _latC_checar_lista imported in function _main
+latgc.obj : warning LNK4049: locally defined symbol _latC_checar_lista imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_checar_lista imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_checar_lista imported
+latfilelib.obj : warning LNK4217: locally defined symbol _latL_agregar imported in function _file_leerlinea
+latino.obj : warning LNK4217: locally defined symbol _latL_agregar imported in function _main
+latstrlib.obj : warning LNK4049: locally defined symbol _latL_agregar imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latL_agregar imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latL_agregar imported
+latfilelib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latmem.obj : warning LNK4217: locally defined symbol _latC_error imported in function _latM_asignar
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latgc.obj : warning LNK4217: locally defined symbol _latL_limpiar_destruir imported in function _gc_recolectar
+latstrlib.obj : warning LNK4049: locally defined symbol _latL_limpiar_destruir imported
+latdevlib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latdiclib.obj : warning LNK4217: locally defined symbol _latC_abrir_liblatino imported in function _dic_longitud
+latfilelib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latmathlib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latgc.obj : warning LNK4217: locally defined symbol _latC_abrir_liblatino imported in function _latC_abrir_liblatino_gc
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_desapilar imported in function _file_leerlinea
+latmathlib.obj : warning LNK4217: locally defined symbol _latC_desapilar imported in function _time
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_desapilar imported
+latdevlib.obj : warning LNK4049: locally defined symbol _latC_desapilar imported
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_desapilar imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_desapilar imported
+latlistlib.obj : warning LNK4217: locally defined symbol _latC_desapilar imported in function _lista_invertir
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_desapilar imported
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_apilar_string imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_apilar_string imported
+latlistlib.obj : warning LNK4217: locally defined symbol _latC_apilar_string imported in function _lista_agregar
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_apilar_string imported
+latsyslib.obj : warning LNK4217: locally defined symbol _latC_checar_cadena imported in function _sleep_ms
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_checar_cadena imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_checar_cadena imported
+latlistlib.obj : warning LNK4217: locally defined symbol _latC_checar_cadena imported in function _lista_invertir
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_checar_cadena imported in function _file_leerlinea
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_abool imported in function _tipo
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_adouble imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_adouble imported
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_astring imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_astring imported
+latdevlib.obj : warning LNK4049: locally defined symbol _latC_astring imported
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_cargarlib imported in function _tipo
+latstrlib.obj : warning LNK4217: locally defined symbol _latC_crear_lista imported in function _reemplazar_lat
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_crear_lista imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_crear_lista imported
+latfilelib.obj : warning LNK4049: locally defined symbol _latC_crear_lista imported
+latstrlib.obj : warning LNK4217: locally defined symbol _latC_checar_numerico imported in function _quitar_espacios
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_checar_numerico imported
+latmathlib.obj : warning LNK4049: locally defined symbol _latC_checar_numerico imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_checar_numerico imported
+latstrlib.obj : warning LNK4217: locally defined symbol _latC_checar_dic imported in function _quitar_espacios
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_checar_dic imported
+latstrlib.obj : warning LNK4217: locally defined symbol _latL_crear imported in function _reemplazar_lat
+latlistlib.obj : warning LNK4049: locally defined symbol _latL_crear imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latL_crear imported
+latfilelib.obj : warning LNK4049: locally defined symbol _latL_crear imported
+latstrlib.obj : warning LNK4217: locally defined symbol _latL_insertar_inicio imported in function _reemplazar_lat
+latstrlib.obj : warning LNK4217: locally defined symbol _latL_extraer_inicio imported in function _reemplazar_lat
+latstrlib.obj : warning LNK4217: locally defined symbol _latL_obtener_elemento imported in function _reemplazar_lat
+latlistlib.obj : warning LNK4049: locally defined symbol _latL_obtener_elemento imported
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_eliminar_nodo imported in function _lista_eliminar_indice
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_extender imported in function _lista_extender
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_contiene_valor imported in function _lista_contiene
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_obtener_nodo imported in function _lista_eliminar_indice
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_insertar_elemento imported in function _lista_insertar
+latsyslib.obj : warning LNK4217: locally defined symbol _latC_apilar_double imported in function _sleep_ms
+  latino.vcxproj -> C:\Users\Layout\Desktop\Latino\visualstudio\src\Debug\latino.exe
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/latino.dir/Debug/latino.tlog/latino.lastbuildstate b/visualstudio/src/latino.dir/Debug/latino.tlog/latino.lastbuildstate
index fbdb90b3..c5c7385c 100644
--- a/visualstudio/src/latino.dir/Debug/latino.tlog/latino.lastbuildstate
+++ b/visualstudio/src/latino.dir/Debug/latino.tlog/latino.lastbuildstate
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 #TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native64Bit:WindowsTargetPlatformVersion=10.0.17763.0
 Debug|x64|C:\Users\ciber\src\latino\visualstudio\|
+=======
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
+Debug|Win32|C:\Users\Layout\Desktop\Latino\visualstudio\|
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/latino.dir/Debug/vc141.pdb b/visualstudio/src/latino.dir/Debug/vc141.pdb
new file mode 100644
index 00000000..9a71c26a
Binary files /dev/null and b/visualstudio/src/latino.dir/Debug/vc141.pdb differ
diff --git a/visualstudio/src/latino.vcxproj b/visualstudio/src/latino.vcxproj
index fdc69ef2..cfd5c43c 100644
--- a/visualstudio/src/latino.vcxproj
+++ b/visualstudio/src/latino.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E1065E73-2BBA-3561-A086-AAA096B77256}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>latino</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +109,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">latino.dir\Debug\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">latino</TargetName>
@@ -88,6 +139,37 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
+=======
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">latino.dir\Debug\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">latino</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">latino.dir\Release\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">latino</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\MinSizeRel\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">latino.dir\MinSizeRel\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">latino</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\RelWithDebInfo\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">latino.dir\RelWithDebInfo\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">latino</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">true</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -97,7 +179,12 @@
       <Optimization>Disabled</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -105,10 +192,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -118,21 +212,36 @@
     <Link>
       <AdditionalDependencies>regex-2.7-src\src\Debug\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ImportLibrary>C:/Users/ciber/src/latino/visualstudio/src/Debug/latino.lib</ImportLibrary>
       <ProgramDataBaseFile>C:/Users/ciber/src/latino/visualstudio/src/Debug/latino.pdb</ProgramDataBaseFile>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ImportLibrary>C:/Users/Layout/Desktop/Latino/visualstudio/src/Debug/latino.lib</ImportLibrary>
+      <ProgramDataBaseFile>C:/Users/Layout/Desktop/Latino/visualstudio/src/Debug/latino.pdb</ProgramDataBaseFile>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <SubSystem>Console</SubSystem>
     </Link>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -140,7 +249,12 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -150,10 +264,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -163,21 +284,36 @@
     <Link>
       <AdditionalDependencies>regex-2.7-src\src\Release\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ImportLibrary>C:/Users/ciber/src/latino/visualstudio/src/Release/latino.lib</ImportLibrary>
       <ProgramDataBaseFile>C:/Users/ciber/src/latino/visualstudio/src/Release/latino.pdb</ProgramDataBaseFile>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ImportLibrary>C:/Users/Layout/Desktop/Latino/visualstudio/src/Release/latino.lib</ImportLibrary>
+      <ProgramDataBaseFile>C:/Users/Layout/Desktop/Latino/visualstudio/src/Release/latino.pdb</ProgramDataBaseFile>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <SubSystem>Console</SubSystem>
     </Link>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -185,7 +321,12 @@
       <Optimization>MinSpace</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -195,10 +336,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -208,21 +356,36 @@
     <Link>
       <AdditionalDependencies>regex-2.7-src\src\MinSizeRel\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ImportLibrary>C:/Users/ciber/src/latino/visualstudio/src/MinSizeRel/latino.lib</ImportLibrary>
       <ProgramDataBaseFile>C:/Users/ciber/src/latino/visualstudio/src/MinSizeRel/latino.pdb</ProgramDataBaseFile>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ImportLibrary>C:/Users/Layout/Desktop/Latino/visualstudio/src/MinSizeRel/latino.lib</ImportLibrary>
+      <ProgramDataBaseFile>C:/Users/Layout/Desktop/Latino/visualstudio/src/MinSizeRel/latino.pdb</ProgramDataBaseFile>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <SubSystem>Console</SubSystem>
     </Link>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <ExceptionHandling>
@@ -231,7 +394,12 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -239,10 +407,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -252,11 +427,19 @@
     <Link>
       <AdditionalDependencies>regex-2.7-src\src\RelWithDebInfo\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ImportLibrary>C:/Users/ciber/src/latino/visualstudio/src/RelWithDebInfo/latino.lib</ImportLibrary>
       <ProgramDataBaseFile>C:/Users/ciber/src/latino/visualstudio/src/RelWithDebInfo/latino.pdb</ProgramDataBaseFile>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ImportLibrary>C:/Users/Layout/Desktop/Latino/visualstudio/src/RelWithDebInfo/latino.lib</ImportLibrary>
+      <ProgramDataBaseFile>C:/Users/Layout/Desktop/Latino/visualstudio/src/RelWithDebInfo/latino.pdb</ProgramDataBaseFile>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <SubSystem>Console</SubSystem>
     </Link>
     <ProjectReference>
@@ -264,10 +447,17 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\src\CMakeLists.txt">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -275,12 +465,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -288,12 +487,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -301,12 +509,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -314,6 +531,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -347,15 +565,56 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latino.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlex.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latparse.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latast.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmem.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdic.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdo.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlist.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmv.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latobj.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latpaqlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latrepl.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latgc.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latbaselib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latstrlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlistlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdiclib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latfilelib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmathlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latsyslib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdevlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\utf8.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\regex2.vcxproj">
       <Project>{97EC7075-DCF4-3099-91A0-7E53969691D7}</Project>
       <Name>regex2</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\regex2.vcxproj">
+      <Project>{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}</Project>
+      <Name>regex2</Name>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/visualstudio/src/latino.vcxproj.filters b/visualstudio/src/latino.vcxproj.filters
index 9a85d9a2..5bd1d28d 100644
--- a/visualstudio/src/latino.vcxproj.filters
+++ b/visualstudio/src/latino.vcxproj.filters
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="C:\Users\ciber\src\latino\src\latino.c">
@@ -68,15 +69,94 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="C:\Users\ciber\src\latino\src\linenoise\linenoise.c">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latino.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdic.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlist.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latobj.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latpaqlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latrepl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latgc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latbaselib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latstrlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlistlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdiclib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latfilelib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmathlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latsyslib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdevlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\utf8.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\src\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{FB96B692-61CB-3380-8CD7-8D3A2CF7BF0D}</UniqueIdentifier>
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{C4DFCDA0-16BB-324F-A53D-85B751345149}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/latino.vcxproj.user b/visualstudio/src/latino.vcxproj.user
index 3fd94064..8c1355ed 100644
--- a/visualstudio/src/latino.vcxproj.user
+++ b/visualstudio/src/latino.vcxproj.user
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LocalDebuggerCommandArguments>$(SolutionDir)..\ejemplos\debug.lat</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 </Project>
\ No newline at end of file
diff --git a/visualstudio/src/liblatino.dir/Debug/liblatino.log b/visualstudio/src/liblatino.dir/Debug/liblatino.log
index f298709e..157b731e 100644
--- a/visualstudio/src/liblatino.dir/Debug/liblatino.log
+++ b/visualstudio/src/liblatino.dir/Debug/liblatino.log
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
   Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt
   CMake does not need to re-run because C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp is up-to-date.
   Compilador de optimización de C/C++ de Microsoft (R) versión 19.21.27702.2 para x64
@@ -206,3 +207,257 @@ C:\Users\ciber\src\latino\src\linenoise\linenoise.c(1285,75): warning C4244:  '=
   Generando código...
 C:\Users\ciber\src\latino\src\linenoise\linenoise.c(1452,28): warning C4267:  '=': conversión de 'size_t' a 'int'; posible pérdida de datos
 LINK : fatal error LNK1104: no se puede abrir el archivo 'C:\Users\ciber\src\latino\visualstudio\src\Debug\latino.ilk'
+=======
+  Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt
+  Microsoft (R) C/C++ Optimizing Compiler Version 19.16.27038 for x86
+  Copyright (C) Microsoft Corporation.  All rights reserved.
+  
+  cl /c /I"C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src" /IC:\Users\Layout\Desktop\Latino\src\linenoise /IC:\Users\Layout\Desktop\Latino\src\..\include /Zi /W4 /WX- /diagnostics:classic /Od /Ob0 /Oy- /D WIN32 /D _WINDOWS /D _CRT_SECURE_NO_WARNINGS /D _DEBUG /D __STDC_CONSTANT_MACROS /D __STDC_FORMAT_MACROS /D __STDC_LIMIT_MACROS /D "CMAKE_INTDIR=\"Debug\"" /D liblatino_EXPORTS /D _WINDLL /D _MBCS /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"liblatino.dir\Debug\\" /Fd"liblatino.dir\Debug\vc141.pdb" /Gd /TC /analyze- /errorReport:prompt C:\Users\Layout\Desktop\Latino\src\latino.c C:\Users\Layout\Desktop\Latino\src\latlex.c C:\Users\Layout\Desktop\Latino\src\latparse.c C:\Users\Layout\Desktop\Latino\src\latast.c C:\Users\Layout\Desktop\Latino\src\latmem.c C:\Users\Layout\Desktop\Latino\src\latdic.c C:\Users\Layout\Desktop\Latino\src\latdo.c C:\Users\Layout\Desktop\Latino\src\latlist.c C:\Users\Layout\Desktop\Latino\src\latmv.c C:\Users\Layout\Desktop\Latino\src\latobj.c C:\Users\Layout\Desktop\Latino\src\latpaqlib.c C:\Users\Layout\Desktop\Latino\src\latrepl.c C:\Users\Layout\Desktop\Latino\src\latgc.c C:\Users\Layout\Desktop\Latino\src\latbaselib.c C:\Users\Layout\Desktop\Latino\src\latstrlib.c C:\Users\Layout\Desktop\Latino\src\latlistlib.c C:\Users\Layout\Desktop\Latino\src\latdiclib.c C:\Users\Layout\Desktop\Latino\src\latfilelib.c C:\Users\Layout\Desktop\Latino\src\latmathlib.c C:\Users\Layout\Desktop\Latino\src\latsyslib.c C:\Users\Layout\Desktop\Latino\src\latdevlib.c C:\Users\Layout\Desktop\Latino\src\linenoise\utf8.c C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c
+  
+  latino.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latino.c(119): warning C4456: declaration of 'i' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\latino.c(81): note: see declaration of 'i'
+  latlex.c
+  latparse.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+latparse.c(1535): warning C4244: '=': conversion from 'int' to 'yytype_int16', possible loss of data
+latparse.c(2468): warning C4127: conditional expression is constant
+latparse.y(468): warning C4100: 'root': unreferenced formal parameter
+latparse.y(468): warning C4100: 'scanner': unreferenced formal parameter
+  latast.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latmem.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latdic.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latdo.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latdo.c(708): warning C4002: too many arguments for function-like macro invocation 'snprintf'
+C:\Users\Layout\Desktop\Latino\src\latdo.c(707): warning C4473: '_snprintf' : not enough arguments passed for format string
+  C:\Users\Layout\Desktop\Latino\src\latdo.c(707): note: placeholders and their parameters expect 4 variadic arguments, but 1 were provided
+  C:\Users\Layout\Desktop\Latino\src\latdo.c(707): note: the missing variadic argument 2 is required by format string '%d'
+  latlist.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latmv.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latmv.c(291): warning C4100: 'ctx': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\latmv.c(532): warning C4244: '=': conversion from 'int' to 'lat_byte', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(964): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(990): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1010): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1014): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1024): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1091): warning C4456: declaration of 'cur' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\latmv.c(552): note: see declaration of 'cur'
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1113): warning C4018: '>': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1116): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(947): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1019): warning C4204: nonstandard extension used: non-constant aggregate initializer
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1029): warning C4204: nonstandard extension used: non-constant aggregate initializer
+  latobj.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latobj.c(116): warning C4018: '>': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latobj.c(319): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(730): warning C4244: 'return': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(733): warning C4244: 'return': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(759): warning C4244: 'return': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(762): warning C4244: 'return': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(772): warning C4244: 'return': conversion from 'double' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(775): warning C4244: 'return': conversion from 'double' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(779): warning C4244: 'return': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(782): warning C4267: 'return': conversion from 'size_t' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(803): warning C4047: 'return': 'char *' differs in levels of indirection from 'char'
+  latpaqlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latrepl.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latgc.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latgc.c(102): warning C4100: 'mv': unreferenced formal parameter
+  latbaselib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latbaselib.c(216): warning C4100: 'mv': unreferenced formal parameter
+  latstrlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(32): warning C4244: '+=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(88): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(94): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(118): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(137): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(141): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(145): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(151): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(164): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(324): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(335): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(447): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(466): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(477): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(563): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(564): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(594): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(595): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(635): warning C4018: '<': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(931): warning C4018: '<': signed/unsigned mismatch
+  latlistlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latlistlib.c(56): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latlistlib.c(101): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latlistlib.c(139): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+  latdiclib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latfilelib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(35): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(38): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(41): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(48): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+  latmathlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(165): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(166): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(170): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(171): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(173): warning C4244: 'function': conversion from 'time_t' to 'unsigned int', possible loss of data
+  latsyslib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(62): warning C4244: 'function': conversion from 'double' to 'DWORD', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(115): warning C4244: 'function': conversion from 'time_t' to 'double', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(119): warning C4244: '=': conversion from 'double' to 'time_t', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(140): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(149): warning C4100: 'mv': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(164): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+  Generating Code...
+c:\users\layout\desktop\latino\src\latstrlib.c(301): warning C4706: assignment within conditional expression
+c:\users\layout\desktop\latino\src\latstrlib.c(551): warning C4702: unreachable code
+c:\users\layout\desktop\latino\src\latmv.c(148): warning C4702: unreachable code
+c:\users\layout\desktop\latino\src\latmv.c(192): warning C4702: unreachable code
+c:\users\layout\desktop\latino\visualstudio\src\latparse.c(2419): warning C4702: unreachable code
+c:\users\layout\desktop\latino\visualstudio\src\latparse.c(2424): warning C4702: unreachable code
+c:\users\layout\desktop\latino\visualstudio\src\latparse.c(2425): warning C4702: unreachable code
+  Compiling...
+  latdevlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  utf8.c
+  linenoise.c
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(733): warning C4100: 'prompt': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(761): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(851): warning C4456: declaration of 'ch' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(789): note: see declaration of 'ch'
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(864): warning C4244: 'function': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(1230): warning C4456: declaration of 'p' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(1220): note: see declaration of 'p'
+  Generating Code...
+  LINK : C:\Users\Layout\Desktop\Latino\visualstudio\src\Debug\latino.dll not found or not built by the last incremental link; performing full link
+     Creating library C:/Users/Layout/Desktop/Latino/visualstudio/src/Debug/latino.lib and object C:/Users/Layout/Desktop/Latino/visualstudio/src/Debug/latino.exp
+latino.obj : warning LNK4217: locally defined symbol _latC_crear_mv imported in function _main
+latdiclib.obj : warning LNK4217: locally defined symbol _latC_apilar imported in function _dic_longitud
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_apilar imported in function _file_leerlinea
+latmathlib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latino.obj : warning LNK4217: locally defined symbol _latC_apilar imported in function _main
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_apilar imported
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_analizar imported in function _file_leerlinea
+latino.obj : warning LNK4217: locally defined symbol _latC_analizar imported in function _main
+latrepl.obj : warning LNK4217: locally defined symbol _latC_analizar imported in function _completion
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_analizar imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_analizar imported
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_llamar_funcion imported in function _file_leerlinea
+latino.obj : warning LNK4217: locally defined symbol _latC_llamar_funcion imported in function _main
+latrepl.obj : warning LNK4217: locally defined symbol _latC_llamar_funcion imported in function _leer_linea
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_llamar_funcion imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_llamar_funcion imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latmathlib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latino.obj : warning LNK4217: locally defined symbol _latC_crear_numerico imported in function _main
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_crear_numerico imported
+latfilelib.obj : warning LNK4049: locally defined symbol _latC_crear_cadena imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_crear_cadena imported
+latino.obj : warning LNK4217: locally defined symbol _latC_crear_cadena imported in function _main
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_crear_cadena imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_crear_cadena imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_crear_cadena imported
+latino.obj : warning LNK4217: locally defined symbol _latC_crear_funcion imported in function _main
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_checar_lista imported in function _file_leerlinea
+latino.obj : warning LNK4217: locally defined symbol _latC_checar_lista imported in function _main
+latgc.obj : warning LNK4049: locally defined symbol _latC_checar_lista imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_checar_lista imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_checar_lista imported
+latfilelib.obj : warning LNK4217: locally defined symbol _latL_agregar imported in function _file_leerlinea
+latino.obj : warning LNK4217: locally defined symbol _latL_agregar imported in function _main
+latstrlib.obj : warning LNK4049: locally defined symbol _latL_agregar imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latL_agregar imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latL_agregar imported
+latfilelib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latmem.obj : warning LNK4217: locally defined symbol _latC_error imported in function _latM_asignar
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_error imported
+latgc.obj : warning LNK4217: locally defined symbol _latL_limpiar_destruir imported in function _gc_recolectar
+latstrlib.obj : warning LNK4049: locally defined symbol _latL_limpiar_destruir imported
+latdevlib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latdiclib.obj : warning LNK4217: locally defined symbol _latC_abrir_liblatino imported in function _dic_longitud
+latfilelib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latmathlib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latgc.obj : warning LNK4217: locally defined symbol _latC_abrir_liblatino imported in function _latC_abrir_liblatino_gc
+latbaselib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_abrir_liblatino imported
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_desapilar imported in function _file_leerlinea
+latmathlib.obj : warning LNK4217: locally defined symbol _latC_desapilar imported in function _time
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_desapilar imported
+latdevlib.obj : warning LNK4049: locally defined symbol _latC_desapilar imported
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_desapilar imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_desapilar imported
+latlistlib.obj : warning LNK4217: locally defined symbol _latC_desapilar imported in function _lista_invertir
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_desapilar imported
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_apilar_string imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_apilar_string imported
+latlistlib.obj : warning LNK4217: locally defined symbol _latC_apilar_string imported in function _lista_agregar
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_apilar_string imported
+latsyslib.obj : warning LNK4217: locally defined symbol _latC_checar_cadena imported in function _sleep_ms
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_checar_cadena imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_checar_cadena imported
+latlistlib.obj : warning LNK4217: locally defined symbol _latC_checar_cadena imported in function _lista_invertir
+latfilelib.obj : warning LNK4217: locally defined symbol _latC_checar_cadena imported in function _file_leerlinea
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_abool imported in function _tipo
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_adouble imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_adouble imported
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_astring imported in function _tipo
+latstrlib.obj : warning LNK4049: locally defined symbol _latC_astring imported
+latdevlib.obj : warning LNK4049: locally defined symbol _latC_astring imported
+latbaselib.obj : warning LNK4217: locally defined symbol _latC_cargarlib imported in function _tipo
+latstrlib.obj : warning LNK4217: locally defined symbol _latC_crear_lista imported in function _reemplazar_lat
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_crear_lista imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_crear_lista imported
+latfilelib.obj : warning LNK4049: locally defined symbol _latC_crear_lista imported
+latstrlib.obj : warning LNK4217: locally defined symbol _latC_checar_numerico imported in function _quitar_espacios
+latlistlib.obj : warning LNK4049: locally defined symbol _latC_checar_numerico imported
+latmathlib.obj : warning LNK4049: locally defined symbol _latC_checar_numerico imported
+latsyslib.obj : warning LNK4049: locally defined symbol _latC_checar_numerico imported
+latstrlib.obj : warning LNK4217: locally defined symbol _latC_checar_dic imported in function _quitar_espacios
+latdiclib.obj : warning LNK4049: locally defined symbol _latC_checar_dic imported
+latstrlib.obj : warning LNK4217: locally defined symbol _latL_crear imported in function _reemplazar_lat
+latlistlib.obj : warning LNK4049: locally defined symbol _latL_crear imported
+latdiclib.obj : warning LNK4049: locally defined symbol _latL_crear imported
+latfilelib.obj : warning LNK4049: locally defined symbol _latL_crear imported
+latstrlib.obj : warning LNK4217: locally defined symbol _latL_insertar_inicio imported in function _reemplazar_lat
+latstrlib.obj : warning LNK4217: locally defined symbol _latL_extraer_inicio imported in function _reemplazar_lat
+latstrlib.obj : warning LNK4217: locally defined symbol _latL_obtener_elemento imported in function _reemplazar_lat
+latlistlib.obj : warning LNK4049: locally defined symbol _latL_obtener_elemento imported
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_eliminar_nodo imported in function _lista_eliminar_indice
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_extender imported in function _lista_extender
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_contiene_valor imported in function _lista_contiene
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_obtener_nodo imported in function _lista_eliminar_indice
+latlistlib.obj : warning LNK4217: locally defined symbol _latL_insertar_elemento imported in function _lista_insertar
+latsyslib.obj : warning LNK4217: locally defined symbol _latC_apilar_double imported in function _sleep_ms
+  liblatino.vcxproj -> C:\Users\Layout\Desktop\Latino\visualstudio\src\Debug\latino.dll
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/liblatino.lastbuildstate b/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/liblatino.lastbuildstate
index fbdb90b3..c5c7385c 100644
--- a/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/liblatino.lastbuildstate
+++ b/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/liblatino.lastbuildstate
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 #TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native64Bit:WindowsTargetPlatformVersion=10.0.17763.0
 Debug|x64|C:\Users\ciber\src\latino\visualstudio\|
+=======
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
+Debug|Win32|C:\Users\Layout\Desktop\Latino\visualstudio\|
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/liblatino.write.1u.tlog b/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/liblatino.write.1u.tlog
new file mode 100644
index 00000000..4dd98c32
Binary files /dev/null and b/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/liblatino.write.1u.tlog differ
diff --git a/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/link.write.1.tlog b/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/link.write.1.tlog
new file mode 100644
index 00000000..6b2e5ff4
Binary files /dev/null and b/visualstudio/src/liblatino.dir/Debug/liblatino.tlog/link.write.1.tlog differ
diff --git a/visualstudio/src/liblatino.dir/Debug/vc141.pdb b/visualstudio/src/liblatino.dir/Debug/vc141.pdb
new file mode 100644
index 00000000..5d7958c0
Binary files /dev/null and b/visualstudio/src/liblatino.dir/Debug/vc141.pdb differ
diff --git a/visualstudio/src/liblatino.vcxproj b/visualstudio/src/liblatino.vcxproj
index 36f7346e..d31ac5ab 100644
--- a/visualstudio/src/liblatino.vcxproj
+++ b/visualstudio/src/liblatino.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F911F51A-B91F-3AE3-97AD-79478CA29940}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>liblatino</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +109,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">liblatino.dir\Debug\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">latino</TargetName>
@@ -88,6 +139,37 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
+=======
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">liblatino.dir\Debug\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">latino</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">liblatino.dir\Release\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">latino</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\MinSizeRel\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">liblatino.dir\MinSizeRel\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">latino</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\RelWithDebInfo\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">liblatino.dir\RelWithDebInfo\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">latino</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">true</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -97,6 +179,7 @@
       <Optimization>Disabled</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
@@ -109,6 +192,21 @@
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+      <UseFullPaths>false</UseFullPaths>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Debug";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"Debug\";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -116,6 +214,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Link>
+<<<<<<< HEAD
       <AdditionalDependencies>regex-2.7-src\src\Debug\regex2.lib;regex-2.7-src\src\Debug\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/Debug;C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/Debug/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
@@ -124,16 +223,33 @@
       <ImportLibrary>C:/Users/ciber/src/latino/visualstudio/src/Debug/latino.lib</ImportLibrary>
       <ModuleDefinitionFile>C:/Users/ciber/src/latino/src/latino.def</ModuleDefinitionFile>
       <ProgramDataBaseFile>C:/Users/ciber/src/latino/visualstudio/src/Debug/latino.pdb</ProgramDataBaseFile>
+=======
+      <AdditionalDependencies>regex-2.7-src\src\Debug\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/Release;C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/Release/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ImportLibrary>C:/Users/Layout/Desktop/Latino/visualstudio/src/Debug/latino.lib</ImportLibrary>
+      <ModuleDefinitionFile>C:/Users/Layout/Desktop/Latino/src/latino.def</ModuleDefinitionFile>
+      <ProgramDataBaseFile>C:/Users/Layout/Desktop/Latino/visualstudio/src/Debug/latino.pdb</ProgramDataBaseFile>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <SubSystem>Console</SubSystem>
     </Link>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -141,20 +257,36 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;LATINO_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Release";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+      <UseFullPaths>false</UseFullPaths>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Release";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <DebugInformationFormat>
       </DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
+<<<<<<< HEAD
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;LATINO_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"Release\";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"Release\";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -162,6 +294,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Link>
+<<<<<<< HEAD
       <AdditionalDependencies>regex-2.7-src\src\Release\regex2.lib;regex-2.7-src\src\Release\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/Debug;C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/Debug/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
@@ -170,16 +303,33 @@
       <ImportLibrary>C:/Users/ciber/src/latino/visualstudio/src/Release/latino.lib</ImportLibrary>
       <ModuleDefinitionFile>C:/Users/ciber/src/latino/src/latino.def</ModuleDefinitionFile>
       <ProgramDataBaseFile>C:/Users/ciber/src/latino/visualstudio/src/Release/latino.pdb</ProgramDataBaseFile>
+=======
+      <AdditionalDependencies>regex-2.7-src\src\Release\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/Release;C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/Release/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ImportLibrary>C:/Users/Layout/Desktop/Latino/visualstudio/src/Release/latino.lib</ImportLibrary>
+      <ModuleDefinitionFile>C:/Users/Layout/Desktop/Latino/src/latino.def</ModuleDefinitionFile>
+      <ProgramDataBaseFile>C:/Users/Layout/Desktop/Latino/visualstudio/src/Release/latino.pdb</ProgramDataBaseFile>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <SubSystem>Console</SubSystem>
     </Link>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -187,20 +337,36 @@
       <Optimization>MinSpace</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;LATINO_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="MinSizeRel";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+      <UseFullPaths>false</UseFullPaths>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="MinSizeRel";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <DebugInformationFormat>
       </DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
+<<<<<<< HEAD
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;LATINO_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"MinSizeRel\";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"MinSizeRel\";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -208,6 +374,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Link>
+<<<<<<< HEAD
       <AdditionalDependencies>regex-2.7-src\src\MinSizeRel\regex2.lib;regex-2.7-src\src\MinSizeRel\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/Debug;C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/Debug/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
@@ -216,16 +383,33 @@
       <ImportLibrary>C:/Users/ciber/src/latino/visualstudio/src/MinSizeRel/latino.lib</ImportLibrary>
       <ModuleDefinitionFile>C:/Users/ciber/src/latino/src/latino.def</ModuleDefinitionFile>
       <ProgramDataBaseFile>C:/Users/ciber/src/latino/visualstudio/src/MinSizeRel/latino.pdb</ProgramDataBaseFile>
+=======
+      <AdditionalDependencies>regex-2.7-src\src\MinSizeRel\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/Release;C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/Release/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ImportLibrary>C:/Users/Layout/Desktop/Latino/visualstudio/src/MinSizeRel/latino.lib</ImportLibrary>
+      <ModuleDefinitionFile>C:/Users/Layout/Desktop/Latino/src/latino.def</ModuleDefinitionFile>
+      <ProgramDataBaseFile>C:/Users/Layout/Desktop/Latino/visualstudio/src/MinSizeRel/latino.pdb</ProgramDataBaseFile>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <SubSystem>Console</SubSystem>
     </Link>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <ExceptionHandling>
@@ -234,6 +418,7 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
@@ -246,6 +431,21 @@
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+      <UseFullPaths>false</UseFullPaths>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="RelWithDebInfo";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"RelWithDebInfo\";liblatino_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -253,6 +453,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Link>
+<<<<<<< HEAD
       <AdditionalDependencies>regex-2.7-src\src\RelWithDebInfo\regex2.lib;regex-2.7-src\src\RelWithDebInfo\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/Debug;C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/Debug/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
@@ -261,6 +462,16 @@
       <ImportLibrary>C:/Users/ciber/src/latino/visualstudio/src/RelWithDebInfo/latino.lib</ImportLibrary>
       <ModuleDefinitionFile>C:/Users/ciber/src/latino/src/latino.def</ModuleDefinitionFile>
       <ProgramDataBaseFile>C:/Users/ciber/src/latino/visualstudio/src/RelWithDebInfo/latino.pdb</ProgramDataBaseFile>
+=======
+      <AdditionalDependencies>regex-2.7-src\src\RelWithDebInfo\regex2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/Release;C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/Release/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ImportLibrary>C:/Users/Layout/Desktop/Latino/visualstudio/src/RelWithDebInfo/latino.lib</ImportLibrary>
+      <ModuleDefinitionFile>C:/Users/Layout/Desktop/Latino/src/latino.def</ModuleDefinitionFile>
+      <ProgramDataBaseFile>C:/Users/Layout/Desktop/Latino/visualstudio/src/RelWithDebInfo/latino.pdb</ProgramDataBaseFile>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <SubSystem>Console</SubSystem>
     </Link>
     <ProjectReference>
@@ -268,10 +479,17 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\src\CMakeLists.txt">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -279,12 +497,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -292,12 +519,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -305,12 +541,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -318,6 +563,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -352,15 +598,57 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latino.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlex.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latparse.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latast.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmem.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdic.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdo.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlist.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmv.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latobj.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latpaqlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latrepl.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latgc.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latbaselib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latstrlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlistlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdiclib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latfilelib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmathlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latsyslib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdevlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\utf8.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c" />
+    <None Include="C:\Users\Layout\Desktop\Latino\src\latino.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\regex2.vcxproj">
       <Project>{97EC7075-DCF4-3099-91A0-7E53969691D7}</Project>
       <Name>regex2</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\regex2.vcxproj">
+      <Project>{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}</Project>
+      <Name>regex2</Name>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/visualstudio/src/liblatino.vcxproj.filters b/visualstudio/src/liblatino.vcxproj.filters
index b8dec415..3f7f59d7 100644
--- a/visualstudio/src/liblatino.vcxproj.filters
+++ b/visualstudio/src/liblatino.vcxproj.filters
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="C:\Users\ciber\src\latino\src\latino.c">
@@ -68,20 +69,102 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="C:\Users\ciber\src\latino\src\linenoise\linenoise.c">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latino.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdic.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlist.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latobj.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latpaqlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latrepl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latgc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latbaselib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latstrlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlistlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdiclib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latfilelib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmathlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latsyslib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdevlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\utf8.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\src\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <None Include="C:\Users\ciber\src\latino\src\latino.def">
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="C:\Users\Layout\Desktop\Latino\src\latino.def">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
+<<<<<<< HEAD
       <UniqueIdentifier>{FB96B692-61CB-3380-8CD7-8D3A2CF7BF0D}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{C4DFCDA0-16BB-324F-A53D-85B751345149}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/liblatino_static.dir/Debug/liblatino_static.log b/visualstudio/src/liblatino_static.dir/Debug/liblatino_static.log
index 54901200..1be8bcf7 100644
--- a/visualstudio/src/liblatino_static.dir/Debug/liblatino_static.log
+++ b/visualstudio/src/liblatino_static.dir/Debug/liblatino_static.log
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
   Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt
   CMake does not need to re-run because C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp is up-to-date.
   Compilador de optimización de C/C++ de Microsoft (R) versión 19.21.27702.2 para x64
@@ -166,3 +167,147 @@ C:\Users\ciber\src\latino\src\linenoise\linenoise.c(1285,75): warning C4244:  '=
   Generando código...
 C:\Users\ciber\src\latino\src\linenoise\linenoise.c(1452,28): warning C4267:  '=': conversión de 'size_t' a 'int'; posible pérdida de datos
   liblatino_static.vcxproj -> C:\Users\ciber\src\latino\visualstudio\src\Debug\liblatino_static.lib
+=======
+  Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt
+  Microsoft (R) C/C++ Optimizing Compiler Version 19.16.27038 for x86
+  Copyright (C) Microsoft Corporation.  All rights reserved.
+  
+  cl /c /I"C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src" /IC:\Users\Layout\Desktop\Latino\src\linenoise /IC:\Users\Layout\Desktop\Latino\src\..\include /Zi /W4 /WX- /diagnostics:classic /Od /Ob0 /Oy- /D WIN32 /D _WINDOWS /D _CRT_SECURE_NO_WARNINGS /D _DEBUG /D __STDC_CONSTANT_MACROS /D __STDC_FORMAT_MACROS /D __STDC_LIMIT_MACROS /D "CMAKE_INTDIR=\"Debug\"" /D _MBCS /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"liblatino_static.dir\Debug\\" /Fd"liblatino_static.dir\Debug\liblatino_static.pdb" /Gd /TC /analyze- /errorReport:prompt C:\Users\Layout\Desktop\Latino\src\latino.c C:\Users\Layout\Desktop\Latino\src\latlex.c C:\Users\Layout\Desktop\Latino\src\latparse.c C:\Users\Layout\Desktop\Latino\src\latast.c C:\Users\Layout\Desktop\Latino\src\latmem.c C:\Users\Layout\Desktop\Latino\src\latdic.c C:\Users\Layout\Desktop\Latino\src\latdo.c C:\Users\Layout\Desktop\Latino\src\latlist.c C:\Users\Layout\Desktop\Latino\src\latmv.c C:\Users\Layout\Desktop\Latino\src\latobj.c C:\Users\Layout\Desktop\Latino\src\latpaqlib.c C:\Users\Layout\Desktop\Latino\src\latrepl.c C:\Users\Layout\Desktop\Latino\src\latgc.c C:\Users\Layout\Desktop\Latino\src\latbaselib.c C:\Users\Layout\Desktop\Latino\src\latstrlib.c C:\Users\Layout\Desktop\Latino\src\latlistlib.c C:\Users\Layout\Desktop\Latino\src\latdiclib.c C:\Users\Layout\Desktop\Latino\src\latfilelib.c C:\Users\Layout\Desktop\Latino\src\latmathlib.c C:\Users\Layout\Desktop\Latino\src\latsyslib.c C:\Users\Layout\Desktop\Latino\src\latdevlib.c C:\Users\Layout\Desktop\Latino\src\linenoise\utf8.c C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c
+  
+  latino.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latino.c(119): warning C4456: declaration of 'i' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\latino.c(81): note: see declaration of 'i'
+  latlex.c
+  latparse.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+latparse.c(1535): warning C4244: '=': conversion from 'int' to 'yytype_int16', possible loss of data
+latparse.c(2468): warning C4127: conditional expression is constant
+latparse.y(468): warning C4100: 'root': unreferenced formal parameter
+latparse.y(468): warning C4100: 'scanner': unreferenced formal parameter
+  latast.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latmem.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latdic.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latdo.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latdo.c(708): warning C4002: too many arguments for function-like macro invocation 'snprintf'
+C:\Users\Layout\Desktop\Latino\src\latdo.c(707): warning C4473: '_snprintf' : not enough arguments passed for format string
+  C:\Users\Layout\Desktop\Latino\src\latdo.c(707): note: placeholders and their parameters expect 4 variadic arguments, but 1 were provided
+  C:\Users\Layout\Desktop\Latino\src\latdo.c(707): note: the missing variadic argument 2 is required by format string '%d'
+  latlist.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latmv.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latmv.c(291): warning C4100: 'ctx': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\latmv.c(532): warning C4244: '=': conversion from 'int' to 'lat_byte', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(964): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(990): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1010): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1014): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1024): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1091): warning C4456: declaration of 'cur' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\latmv.c(552): note: see declaration of 'cur'
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1113): warning C4018: '>': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1116): warning C4018: '>=': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latmv.c(947): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1019): warning C4204: nonstandard extension used: non-constant aggregate initializer
+C:\Users\Layout\Desktop\Latino\src\latmv.c(1029): warning C4204: nonstandard extension used: non-constant aggregate initializer
+  latobj.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latobj.c(116): warning C4018: '>': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latobj.c(319): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(730): warning C4244: 'return': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(733): warning C4244: 'return': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(759): warning C4244: 'return': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(762): warning C4244: 'return': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(772): warning C4244: 'return': conversion from 'double' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(775): warning C4244: 'return': conversion from 'double' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(779): warning C4244: 'return': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(782): warning C4267: 'return': conversion from 'size_t' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latobj.c(803): warning C4047: 'return': 'char *' differs in levels of indirection from 'char'
+  latpaqlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latrepl.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latgc.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latgc.c(102): warning C4100: 'mv': unreferenced formal parameter
+  latbaselib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latbaselib.c(216): warning C4100: 'mv': unreferenced formal parameter
+  latstrlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(32): warning C4244: '+=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(88): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(94): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(118): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(137): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(141): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(145): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(151): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(164): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(324): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(335): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(447): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(466): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(477): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(563): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(564): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(594): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(595): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(635): warning C4018: '<': signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latstrlib.c(931): warning C4018: '<': signed/unsigned mismatch
+  latlistlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latlistlib.c(56): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latlistlib.c(101): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latlistlib.c(139): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+  latdiclib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  latfilelib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(35): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(38): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(41): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+C:\Users\Layout\Desktop\Latino\src\latfilelib.c(48): warning C4245: 'return': conversion from 'int' to 'size_t', signed/unsigned mismatch
+  latmathlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(165): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(166): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(170): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(171): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latmathlib.c(173): warning C4244: 'function': conversion from 'time_t' to 'unsigned int', possible loss of data
+  latsyslib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(62): warning C4244: 'function': conversion from 'double' to 'DWORD', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(115): warning C4244: 'function': conversion from 'time_t' to 'double', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(119): warning C4244: '=': conversion from 'double' to 'time_t', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(140): warning C4244: 'function': conversion from 'double' to 'int', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(149): warning C4100: 'mv': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\latsyslib.c(164): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+  Generating Code...
+c:\users\layout\desktop\latino\src\latstrlib.c(301): warning C4706: assignment within conditional expression
+c:\users\layout\desktop\latino\src\latstrlib.c(551): warning C4702: unreachable code
+c:\users\layout\desktop\latino\src\latmv.c(192): warning C4702: unreachable code
+c:\users\layout\desktop\latino\src\latmv.c(148): warning C4702: unreachable code
+c:\users\layout\desktop\latino\visualstudio\src\latparse.c(2419): warning C4702: unreachable code
+c:\users\layout\desktop\latino\visualstudio\src\latparse.c(2424): warning C4702: unreachable code
+c:\users\layout\desktop\latino\visualstudio\src\latparse.c(2425): warning C4702: unreachable code
+  Compiling...
+  latdevlib.c
+c:\users\layout\desktop\latino\include\latino.h(58): warning C4068: unknown pragma
+  utf8.c
+  linenoise.c
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(733): warning C4100: 'prompt': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(761): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(851): warning C4456: declaration of 'ch' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(789): note: see declaration of 'ch'
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(864): warning C4244: 'function': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(1230): warning C4456: declaration of 'p' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(1220): note: see declaration of 'p'
+  Generating Code...
+  liblatino_static.vcxproj -> C:\Users\Layout\Desktop\Latino\visualstudio\src\Debug\liblatino_static.lib
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/liblatino_static.dir/Debug/liblatino_static.tlog/liblatino_static.lastbuildstate b/visualstudio/src/liblatino_static.dir/Debug/liblatino_static.tlog/liblatino_static.lastbuildstate
index fbdb90b3..c5c7385c 100644
--- a/visualstudio/src/liblatino_static.dir/Debug/liblatino_static.tlog/liblatino_static.lastbuildstate
+++ b/visualstudio/src/liblatino_static.dir/Debug/liblatino_static.tlog/liblatino_static.lastbuildstate
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 #TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native64Bit:WindowsTargetPlatformVersion=10.0.17763.0
 Debug|x64|C:\Users\ciber\src\latino\visualstudio\|
+=======
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
+Debug|Win32|C:\Users\Layout\Desktop\Latino\visualstudio\|
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/liblatino_static.vcxproj b/visualstudio/src/liblatino_static.vcxproj
index 56d8749c..c4b57666 100644
--- a/visualstudio/src/liblatino_static.vcxproj
+++ b/visualstudio/src/liblatino_static.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4F44FE0A-0137-36DC-9372-A33AFC5FCBFE}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>liblatino_static</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +109,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">liblatino_static.dir\Debug\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">liblatino_static</TargetName>
@@ -80,6 +131,29 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
+=======
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">liblatino_static.dir\Debug\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">liblatino_static</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">liblatino_static.dir\Release\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">liblatino_static</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\MinSizeRel\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">liblatino_static.dir\MinSizeRel\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">liblatino_static</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\RelWithDebInfo\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">liblatino_static.dir\RelWithDebInfo\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">liblatino_static</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.lib</TargetExt>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -89,7 +163,12 @@
       <Optimization>Disabled</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -97,10 +176,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -108,6 +194,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -115,6 +202,15 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -122,7 +218,12 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -132,10 +233,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -143,6 +251,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -150,6 +259,15 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -157,7 +275,12 @@
       <Optimization>MinSpace</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -167,10 +290,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -178,6 +308,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -185,6 +316,15 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <ExceptionHandling>
@@ -193,7 +333,12 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -201,10 +346,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;C:\Users\ciber\src\latino\src\linenoise;C:\Users\ciber\src\latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;C:\Users\Layout\Desktop\Latino\src\linenoise;C:\Users\Layout\Desktop\Latino\src\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -212,6 +364,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -220,6 +373,16 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -227,12 +390,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -240,12 +412,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -253,12 +434,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -266,6 +456,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/src/CMakeLists.txt;C:\Users\ciber\src\latino\cmake\Modules\CPack.cmake;C:\Users\ciber\src\latino\src\CMakeLists.txt;C:\bin\CMake\share\cmake-3.14\Modules\CPackComponent.cmake;C:\bin\CMake\share\cmake-3.14\Templates\CPackConfig.cmake.in;C:\Users\ciber\src\latino\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -299,15 +490,56 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Program Files\CMake\share\cmake-3.16\Modules\CPackComponent.cmake;C:\Program Files\CMake\share\cmake-3.16\Templates\CPackConfig.cmake.in;C:\Users\Layout\Desktop\Latino\cmake\Modules\CPack.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latino.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlex.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latparse.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latast.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmem.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdic.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdo.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlist.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmv.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latobj.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latpaqlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latrepl.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latgc.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latbaselib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latstrlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlistlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdiclib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latfilelib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmathlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latsyslib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdevlib.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\utf8.c" />
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\regex2.vcxproj">
       <Project>{97EC7075-DCF4-3099-91A0-7E53969691D7}</Project>
       <Name>regex2</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\regex2.vcxproj">
+      <Project>{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}</Project>
+      <Name>regex2</Name>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/visualstudio/src/liblatino_static.vcxproj.filters b/visualstudio/src/liblatino_static.vcxproj.filters
index 9a85d9a2..5bd1d28d 100644
--- a/visualstudio/src/liblatino_static.vcxproj.filters
+++ b/visualstudio/src/liblatino_static.vcxproj.filters
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="C:\Users\ciber\src\latino\src\latino.c">
@@ -68,15 +69,94 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="C:\Users\ciber\src\latino\src\linenoise\linenoise.c">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latino.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdic.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlist.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latobj.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latpaqlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latrepl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latgc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latbaselib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latstrlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latlistlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdiclib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latfilelib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latmathlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latsyslib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\latdevlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\utf8.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\src\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{FB96B692-61CB-3380-8CD7-8D3A2CF7BF0D}</UniqueIdentifier>
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{C4DFCDA0-16BB-324F-A53D-85B751345149}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/linenoise/PACKAGE.vcxproj b/visualstudio/src/linenoise/PACKAGE.vcxproj
index e2795a95..bb7a05f4 100644
--- a/visualstudio/src/linenoise/PACKAGE.vcxproj
+++ b/visualstudio/src/linenoise/PACKAGE.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -26,10 +27,36 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FBBB5B2A-E916-3548-8422-48CC98F1697E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <ProjectName>PACKAGE</ProjectName>
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+<<<<<<< HEAD
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -49,6 +76,27 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,12 +107,21 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -76,11 +133,19 @@
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -90,7 +155,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -102,11 +171,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -116,7 +193,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -128,11 +209,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -142,7 +231,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -154,11 +247,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -169,9 +270,15 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\f2f1621cb7c755d78f189c0bae0e211c\PACKAGE_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\52b235d76bb7527dea3817e2788d2147\PACKAGE_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -180,11 +287,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/f2f1621cb7c755d78f189c0bae0e211c/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -193,11 +308,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/f2f1621cb7c755d78f189c0bae0e211c/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -206,11 +329,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/f2f1621cb7c755d78f189c0bae0e211c/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -219,6 +350,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/f2f1621cb7c755d78f189c0bae0e211c/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -227,12 +359,27 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ALL_BUILD.vcxproj">
       <Project>{F40FC4C3-982F-3C83-A595-41DF3D362576}</Project>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ALL_BUILD.vcxproj">
+      <Project>{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ALL_BUILD</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/linenoise/PACKAGE.vcxproj.filters b/visualstudio/src/linenoise/PACKAGE.vcxproj.filters
index ee44c2b5..4f03f36e 100644
--- a/visualstudio/src/linenoise/PACKAGE.vcxproj.filters
+++ b/visualstudio/src/linenoise/PACKAGE.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\f2f1621cb7c755d78f189c0bae0e211c\PACKAGE_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\52b235d76bb7527dea3817e2788d2147\PACKAGE_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/linenoise/RUN_TESTS.vcxproj b/visualstudio/src/linenoise/RUN_TESTS.vcxproj
index da6bb873..cb122697 100644
--- a/visualstudio/src/linenoise/RUN_TESTS.vcxproj
+++ b/visualstudio/src/linenoise/RUN_TESTS.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -26,10 +27,36 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BE9D3145-B359-3E69-AC76-EE107F52BEB5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <ProjectName>RUN_TESTS</ProjectName>
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+<<<<<<< HEAD
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -49,6 +76,27 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,12 +107,21 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -76,7 +133,11 @@
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -86,7 +147,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -98,7 +163,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -108,7 +177,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -120,7 +193,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -130,7 +207,11 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
@@ -142,7 +223,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -153,9 +238,15 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\f2f1621cb7c755d78f189c0bae0e211c\RUN_TESTS_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\52b235d76bb7527dea3817e2788d2147\RUN_TESTS_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -164,11 +255,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/f2f1621cb7c755d78f189c0bae0e211c/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -177,11 +276,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/f2f1621cb7c755d78f189c0bae0e211c/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -190,11 +297,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/f2f1621cb7c755d78f189c0bae0e211c/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -203,6 +318,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/f2f1621cb7c755d78f189c0bae0e211c/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -211,6 +327,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/linenoise/RUN_TESTS.vcxproj.filters b/visualstudio/src/linenoise/RUN_TESTS.vcxproj.filters
index ec3528a5..da897658 100644
--- a/visualstudio/src/linenoise/RUN_TESTS.vcxproj.filters
+++ b/visualstudio/src/linenoise/RUN_TESTS.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\f2f1621cb7c755d78f189c0bae0e211c\RUN_TESTS_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\52b235d76bb7527dea3817e2788d2147\RUN_TESTS_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/linenoise/linenoise.dir/Debug/linenoise.log b/visualstudio/src/linenoise/linenoise.dir/Debug/linenoise.log
index fe9207d9..7a437b70 100644
--- a/visualstudio/src/linenoise/linenoise.dir/Debug/linenoise.log
+++ b/visualstudio/src/linenoise/linenoise.dir/Debug/linenoise.log
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
   Building Custom Rule C:/Users/ciber/src/latino/src/linenoise/CMakeLists.txt
   CMake does not need to re-run because C:/Users/ciber/src/latino/visualstudio/src/linenoise/CMakeFiles/generate.stamp is up-to-date.
   Compilador de optimización de C/C++ de Microsoft (R) versión 19.21.27702.2 para x64
@@ -18,3 +19,20 @@ C:\Users\ciber\src\latino\src\linenoise\linenoise.c(1232,44): warning C4267:  '=
 C:\Users\ciber\src\latino\src\linenoise\linenoise.c(1285,75): warning C4244:  '=': conversión de '__int64' a 'int'; posible pérdida de datos
 C:\Users\ciber\src\latino\src\linenoise\linenoise.c(1452,28): warning C4267:  '=': conversión de 'size_t' a 'int'; posible pérdida de datos
   linenoise.vcxproj -> C:\Users\ciber\src\latino\visualstudio\src\linenoise\Debug\linenoise.lib
+=======
+  Building Custom Rule C:/Users/Layout/Desktop/Latino/src/linenoise/CMakeLists.txt
+  Microsoft (R) C/C++ Optimizing Compiler Version 19.16.27038 for x86
+  Copyright (C) Microsoft Corporation.  All rights reserved.
+  
+  cl /c /Zi /W4 /WX- /diagnostics:classic /Od /Ob0 /Oy- /D WIN32 /D _WINDOWS /D _CRT_SECURE_NO_WARNINGS /D _DEBUG /D __STDC_CONSTANT_MACROS /D __STDC_FORMAT_MACROS /D __STDC_LIMIT_MACROS /D "CMAKE_INTDIR=\"Debug\"" /D _MBCS /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"linenoise.dir\Debug\\" /Fd"linenoise.dir\Debug\linenoise.pdb" /Gd /TC /analyze- /errorReport:prompt C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c
+  
+  linenoise.c
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(733): warning C4100: 'prompt': unreferenced formal parameter
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(761): warning C4244: '=': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(851): warning C4456: declaration of 'ch' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(789): note: see declaration of 'ch'
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(864): warning C4244: 'function': conversion from 'int' to 'char', possible loss of data
+C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(1230): warning C4456: declaration of 'p' hides previous local declaration
+  C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c(1220): note: see declaration of 'p'
+  linenoise.vcxproj -> C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\Debug\linenoise.lib
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/linenoise/linenoise.dir/Debug/linenoise.tlog/linenoise.lastbuildstate b/visualstudio/src/linenoise/linenoise.dir/Debug/linenoise.tlog/linenoise.lastbuildstate
index fbdb90b3..c5c7385c 100644
--- a/visualstudio/src/linenoise/linenoise.dir/Debug/linenoise.tlog/linenoise.lastbuildstate
+++ b/visualstudio/src/linenoise/linenoise.dir/Debug/linenoise.tlog/linenoise.lastbuildstate
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 #TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native64Bit:WindowsTargetPlatformVersion=10.0.17763.0
 Debug|x64|C:\Users\ciber\src\latino\visualstudio\|
+=======
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
+Debug|Win32|C:\Users\Layout\Desktop\Latino\visualstudio\|
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/linenoise/linenoise.vcxproj b/visualstudio/src/linenoise/linenoise.vcxproj
index dd02dd72..a383f0ab 100644
--- a/visualstudio/src/linenoise/linenoise.vcxproj
+++ b/visualstudio/src/linenoise/linenoise.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B90DCFE9-12E8-3B69-A0DC-10325F593B61}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>linenoise</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +109,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">linenoise.dir\Debug\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">linenoise</TargetName>
@@ -79,6 +130,28 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
+=======
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">linenoise.dir\Debug\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">linenoise</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">linenoise.dir\Release\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">linenoise</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\MinSizeRel\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">linenoise.dir\MinSizeRel\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">linenoise</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\RelWithDebInfo\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">linenoise.dir\RelWithDebInfo\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">linenoise</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.lib</TargetExt>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -88,7 +161,12 @@
       <Optimization>Disabled</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -106,12 +184,21 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -119,7 +206,12 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -139,12 +231,21 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <ClCompile>
       <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <ClCompile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -152,7 +253,12 @@
       <Optimization>MinSpace</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -172,12 +278,21 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <ClCompile>
       <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <ClCompile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <ExceptionHandling>
@@ -186,7 +301,12 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -204,6 +324,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -212,6 +333,16 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/linenoise/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/linenoise/CMakeFiles/generate.stamp
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\linenoise\CMakeLists.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/linenoise/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/linenoise/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -219,12 +350,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/src/linenoise/CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/linenoise/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/linenoise/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/linenoise/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/linenoise/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -232,12 +372,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/src/linenoise/CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/linenoise/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/linenoise/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/linenoise/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/linenoise/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -245,12 +394,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/src/linenoise/CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/linenoise/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/linenoise/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/linenoise/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/linenoise/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -258,6 +416,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/src/linenoise/CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -269,6 +428,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\linenoise\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/linenoise/linenoise.vcxproj.filters b/visualstudio/src/linenoise/linenoise.vcxproj.filters
index 7979e74a..0eedddc1 100644
--- a/visualstudio/src/linenoise/linenoise.vcxproj.filters
+++ b/visualstudio/src/linenoise/linenoise.vcxproj.filters
@@ -1,16 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="C:\Users\ciber\src\latino\src\linenoise\linenoise.c">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\linenoise\linenoise.c">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\src\linenoise\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{FB96B692-61CB-3380-8CD7-8D3A2CF7BF0D}</UniqueIdentifier>
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\linenoise\CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{C4DFCDA0-16BB-324F-A53D-85B751345149}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/regex-2.7-src/PACKAGE.vcxproj b/visualstudio/src/regex-2.7-src/PACKAGE.vcxproj
index 6b398492..276923ab 100644
--- a/visualstudio/src/regex-2.7-src/PACKAGE.vcxproj
+++ b/visualstudio/src/regex-2.7-src/PACKAGE.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -26,10 +27,36 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FBBB5B2A-E916-3548-8422-48CC98F1697E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <ProjectName>PACKAGE</ProjectName>
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+<<<<<<< HEAD
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -49,6 +76,27 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +107,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
@@ -67,6 +116,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -76,11 +135,19 @@
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -90,9 +157,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -102,11 +175,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -116,9 +197,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -128,11 +215,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -142,9 +237,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -154,11 +255,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -169,9 +278,15 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\a9f83fa3b4f539e864b04cd377aa7476\PACKAGE_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\94fb98cb4460704d26806b170852159a\PACKAGE_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -180,11 +295,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/a9f83fa3b4f539e864b04cd377aa7476/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -193,11 +316,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/a9f83fa3b4f539e864b04cd377aa7476/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -206,11 +337,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/a9f83fa3b4f539e864b04cd377aa7476/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -219,6 +358,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/a9f83fa3b4f539e864b04cd377aa7476/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -227,12 +367,27 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ALL_BUILD.vcxproj">
       <Project>{F40FC4C3-982F-3C83-A595-41DF3D362576}</Project>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ALL_BUILD.vcxproj">
+      <Project>{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ALL_BUILD</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/regex-2.7-src/PACKAGE.vcxproj.filters b/visualstudio/src/regex-2.7-src/PACKAGE.vcxproj.filters
index 6682bcd4..f8079f62 100644
--- a/visualstudio/src/regex-2.7-src/PACKAGE.vcxproj.filters
+++ b/visualstudio/src/regex-2.7-src/PACKAGE.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\a9f83fa3b4f539e864b04cd377aa7476\PACKAGE_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\94fb98cb4460704d26806b170852159a\PACKAGE_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/regex-2.7-src/RUN_TESTS.vcxproj b/visualstudio/src/regex-2.7-src/RUN_TESTS.vcxproj
index 6c467430..2a2b2a83 100644
--- a/visualstudio/src/regex-2.7-src/RUN_TESTS.vcxproj
+++ b/visualstudio/src/regex-2.7-src/RUN_TESTS.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -26,10 +27,36 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BE9D3145-B359-3E69-AC76-EE107F52BEB5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <ProjectName>RUN_TESTS</ProjectName>
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+<<<<<<< HEAD
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -49,6 +76,27 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +107,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
@@ -67,6 +116,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -76,7 +135,11 @@
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -86,9 +149,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -98,7 +167,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -108,9 +181,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -120,7 +199,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -130,9 +213,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -142,7 +231,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -153,9 +246,15 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\a9f83fa3b4f539e864b04cd377aa7476\RUN_TESTS_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\94fb98cb4460704d26806b170852159a\RUN_TESTS_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -164,11 +263,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/a9f83fa3b4f539e864b04cd377aa7476/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -177,11 +284,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/a9f83fa3b4f539e864b04cd377aa7476/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -190,11 +305,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/a9f83fa3b4f539e864b04cd377aa7476/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -203,6 +326,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/a9f83fa3b4f539e864b04cd377aa7476/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -211,6 +335,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/regex-2.7-src/RUN_TESTS.vcxproj.filters b/visualstudio/src/regex-2.7-src/RUN_TESTS.vcxproj.filters
index 86e493d8..127b6731 100644
--- a/visualstudio/src/regex-2.7-src/RUN_TESTS.vcxproj.filters
+++ b/visualstudio/src/regex-2.7-src/RUN_TESTS.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\a9f83fa3b4f539e864b04cd377aa7476\RUN_TESTS_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\94fb98cb4460704d26806b170852159a\RUN_TESTS_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/regex-2.7-src/src/PACKAGE.vcxproj b/visualstudio/src/regex-2.7-src/src/PACKAGE.vcxproj
index 99f998f5..9ce36317 100644
--- a/visualstudio/src/regex-2.7-src/src/PACKAGE.vcxproj
+++ b/visualstudio/src/regex-2.7-src/src/PACKAGE.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -26,10 +27,36 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FBBB5B2A-E916-3548-8422-48CC98F1697E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <ProjectName>PACKAGE</ProjectName>
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+<<<<<<< HEAD
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -49,6 +76,27 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +107,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
@@ -67,6 +116,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -76,11 +135,19 @@
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -90,9 +157,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -102,11 +175,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -116,9 +197,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -128,11 +215,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -142,9 +237,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -154,11 +255,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 cd C:\Users\ciber\src\latino\visualstudio
 if %errorlevel% neq 0 goto :cmEnd
 C:
 if %errorlevel% neq 0 goto :cmEnd
 C:\bin\CMake\bin\cpack.exe -C $(Configuration) --config ./CPackConfig.cmake
+=======
+cd C:\Users\Layout\Desktop\Latino\visualstudio
+if %errorlevel% neq 0 goto :cmEnd
+C:
+if %errorlevel% neq 0 goto :cmEnd
+"C:\Program Files\CMake\bin\cpack.exe" -C $(Configuration) --config ./CPackConfig.cmake
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -169,9 +278,15 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\356fa9b67bd60e66375f2b1ab608e129\PACKAGE_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\21b97e94c24dee92722bda1dc6644a79\PACKAGE_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -180,11 +295,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/356fa9b67bd60e66375f2b1ab608e129/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -193,11 +316,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/356fa9b67bd60e66375f2b1ab608e129/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -206,11 +337,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/356fa9b67bd60e66375f2b1ab608e129/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -219,6 +358,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/356fa9b67bd60e66375f2b1ab608e129/PACKAGE_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\PACKAGE_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -227,12 +367,27 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\PACKAGE_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+<<<<<<< HEAD
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ALL_BUILD.vcxproj">
       <Project>{F40FC4C3-982F-3C83-A595-41DF3D362576}</Project>
+=======
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ALL_BUILD.vcxproj">
+      <Project>{05DE0EAD-AEA6-3F54-A1AA-0C112E122AB8}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ALL_BUILD</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/regex-2.7-src/src/PACKAGE.vcxproj.filters b/visualstudio/src/regex-2.7-src/src/PACKAGE.vcxproj.filters
index f1fba215..e99949b9 100644
--- a/visualstudio/src/regex-2.7-src/src/PACKAGE.vcxproj.filters
+++ b/visualstudio/src/regex-2.7-src/src/PACKAGE.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\356fa9b67bd60e66375f2b1ab608e129\PACKAGE_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\21b97e94c24dee92722bda1dc6644a79\PACKAGE_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/regex-2.7-src/src/RUN_TESTS.vcxproj b/visualstudio/src/regex-2.7-src/src/RUN_TESTS.vcxproj
index 054f38d4..5e9828a6 100644
--- a/visualstudio/src/regex-2.7-src/src/RUN_TESTS.vcxproj
+++ b/visualstudio/src/regex-2.7-src/src/RUN_TESTS.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -26,10 +27,36 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BE9D3145-B359-3E69-AC76-EE107F52BEB5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     <ProjectName>RUN_TESTS</ProjectName>
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+<<<<<<< HEAD
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -49,6 +76,27 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +107,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
@@ -67,6 +116,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -76,7 +135,11 @@
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -86,9 +149,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -98,7 +167,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -108,9 +181,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -120,7 +199,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -130,9 +213,15 @@ exit /b %1
 if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+<<<<<<< HEAD
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -142,7 +231,11 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <PostBuildEvent>
       <Message></Message>
       <Command>setlocal
+<<<<<<< HEAD
 C:\bin\CMake\bin\ctest.exe --force-new-ctest-process -C $(Configuration)
+=======
+"C:\Program Files\CMake\bin\ctest.exe" --force-new-ctest-process -C $(Configuration)
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -153,9 +246,15 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\356fa9b67bd60e66375f2b1ab608e129\RUN_TESTS_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\21b97e94c24dee92722bda1dc6644a79\RUN_TESTS_force.rule">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -164,11 +263,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/356fa9b67bd60e66375f2b1ab608e129/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -177,11 +284,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/356fa9b67bd60e66375f2b1ab608e129/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -190,11 +305,19 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/356fa9b67bd60e66375f2b1ab608e129/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'"> </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 cd .
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
@@ -203,6 +326,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/visualstudio/CMakeFiles/356fa9b67bd60e66375f2b1ab608e129/RUN_TESTS_force.rule;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\RUN_TESTS_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -211,6 +335,16 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\RUN_TESTS_force</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/regex-2.7-src/src/RUN_TESTS.vcxproj.filters b/visualstudio/src/regex-2.7-src/src/RUN_TESTS.vcxproj.filters
index 2b5fa35d..b1af0518 100644
--- a/visualstudio/src/regex-2.7-src/src/RUN_TESTS.vcxproj.filters
+++ b/visualstudio/src/regex-2.7-src/src/RUN_TESTS.vcxproj.filters
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <CustomBuild Include="C:\Users\ciber\src\latino\visualstudio\CMakeFiles\356fa9b67bd60e66375f2b1ab608e129\RUN_TESTS_force.rule">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\visualstudio\CMakeFiles\21b97e94c24dee92722bda1dc6644a79\RUN_TESTS_force.rule">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
+<<<<<<< HEAD
       <UniqueIdentifier>{70F29324-7D91-3064-AA79-682ACE6348B1}</UniqueIdentifier>
+=======
+      <UniqueIdentifier>{D595C31F-FB40-3755-B890-08B12A117AED}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/visualstudio/src/regex-2.7-src/src/regex2.dir/Debug/regex2.log b/visualstudio/src/regex-2.7-src/src/regex2.dir/Debug/regex2.log
index f908a327..dd28246d 100644
--- a/visualstudio/src/regex-2.7-src/src/regex2.dir/Debug/regex2.log
+++ b/visualstudio/src/regex-2.7-src/src/regex2.dir/Debug/regex2.log
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
   Building Custom Rule C:/Users/ciber/src/latino/src/regex-2.7-src/src/CMakeLists.txt
   CMake does not need to re-run because C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/CMakeFiles/generate.stamp is up-to-date.
   Compilador de optimización de C/C++ de Microsoft (R) versión 19.21.27702.2 para x64
@@ -83,3 +84,90 @@ C:\Users\ciber\src\latino\src\regex-2.7-src\src\regexec.c(1476,49): warning C426
 C:\Users\ciber\src\latino\src\regex-2.7-src\src\regexec.c(3036,17): warning C4189:  'err': la variable local se ha inicializado pero no se hace referencia a ella
 C:\Users\ciber\src\latino\src\regex-2.7-src\src\regexec.c(3036,17): warning C4189: C:\Users\ciber\src\latino\src\regex-2.7-src\src\regexec.c(2203) : warning C4701: posiblemente se utilizó la variable local 'local_sctx' sin inicializar
   regex2.vcxproj -> C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\Debug\regex2.lib
+=======
+  Building Custom Rule C:/Users/Layout/Desktop/Latino/src/regex-2.7-src/src/CMakeLists.txt
+  Microsoft (R) C/C++ Optimizing Compiler Version 19.16.27038 for x86
+  Copyright (C) Microsoft Corporation.  All rights reserved.
+  
+  cl /c /I"C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src" /Zi /W4 /WX- /diagnostics:classic /Od /Ob0 /Oy- /D WIN32 /D _WINDOWS /D _CRT_SECURE_NO_WARNINGS /D _DEBUG /D __STDC_CONSTANT_MACROS /D __STDC_FORMAT_MACROS /D __STDC_LIMIT_MACROS /D "CMAKE_INTDIR=\"Debug\"" /D _MBCS /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"regex2.dir\Debug\\" /Fd"regex2.dir\Debug\regex2.pdb" /Gd /TC /analyze- /errorReport:prompt "C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src\regex.c"
+  
+  regex.c
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex_internal.c(57): warning C4244: '=': conversion from 'const unsigned int' to 'unsigned char', possible loss of data
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex_internal.c(175): warning C4244: '=': conversion from 'const unsigned int' to 'unsigned char', possible loss of data
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex_internal.c(176): warning C4244: '=': conversion from 'const unsigned int' to 'unsigned char', possible loss of data
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex_internal.c(530): warning C4244: '=': conversion from 'int' to 'unsigned char', possible loss of data
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex_internal.c(532): warning C4244: '=': conversion from 'int' to 'unsigned char', possible loss of data
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex_internal.c(678): warning C4189: 'prev_valid_len': local variable is initialized but not referenced
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex_internal.c(854): warning C4244: 'return': conversion from 'int' to 'unsigned char', possible loss of data
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex_internal.c(1399): warning C4189: 'type': local variable is initialized but not referenced
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(215): warning C4131: 're_compile_pattern': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(215): warning C4273: 're_compile_pattern': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(482): note: see previous definition of 're_compile_pattern'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(244): warning C4273: 're_syntax_options': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(214): note: see previous definition of 're_syntax_options'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(256): warning C4131: 're_set_syntax': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(256): warning C4273: 're_set_syntax': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(477): note: see previous definition of 're_set_syntax'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(269): warning C4131: 're_compile_fastmap': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(269): warning C4273: 're_compile_fastmap': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(489): note: see previous definition of 're_compile_fastmap'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(448): warning C4131: 'regcomp': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(448): warning C4273: 'regcomp': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(570): note: see previous definition of 'regcomp'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(510): warning C4131: 'regerror': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(510): warning C4273: 'regerror': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(579): note: see previous definition of 'regerror'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(509): warning C4100: 'preg': unreferenced formal parameter
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(572): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(575): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(590): warning C4018: '<=': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(618): warning C4131: 'regfree': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(618): warning C4273: 'regfree': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(582): note: see previous definition of 'regfree'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(1107): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(1110): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(1113): warning C4389: '==': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(1327): warning C4100: 'extra': unreferenced formal parameter
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(1560): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(1563): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(1592): warning C4389: '==': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(3260): warning C4100: 'dfa': unreferenced formal parameter
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regcomp.c(3751): warning C4100: 'extra': unreferenced formal parameter
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(222): warning C4131: 'regexec': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(222): warning C4273: 'regexec': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(574): note: see previous definition of 'regexec'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(230): warning C4189: 'dfa': local variable is initialized but not referenced
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(308): warning C4131: 're_match': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(308): warning C4273: 're_match': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(512): note: see previous definition of 're_match'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(321): warning C4131: 're_search': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(321): warning C4273: 're_search': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(497): note: see previous definition of 're_search'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(334): warning C4131: 're_match_2': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(334): warning C4273: 're_match_2': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(517): note: see previous definition of 're_match_2'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(348): warning C4131: 're_search_2': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(348): warning C4273: 're_search_2': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(504): note: see previous definition of 're_search_2'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(363): warning C4131: 're_search_2_stub': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(412): warning C4131: 're_search_stub': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(421): warning C4189: 'dfa': local variable is initialized but not referenced
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(501): warning C4131: 're_copy_regs': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(524): warning C4018: '>': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(539): warning C4018: '>=': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(549): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(570): warning C4131: 're_set_registers': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(570): warning C4273: 're_set_registers': inconsistent dll linkage
+  c:\users\layout\desktop\latino\src\regex-2.7-src\src\regex.h(535): note: see previous definition of 're_set_registers'
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(622): warning C4131: 're_search_internal': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(684): warning C4244: '=': conversion from 'const unsigned int' to 'unsigned char', possible loss of data
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(874): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(892): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(920): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(940): warning C4131: 'prune_impossible_nodes': uses old-style declarator
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(1439): warning C4018: '<': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(1442): warning C4389: '==': signed/unsigned mismatch
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(3036): warning C4189: 'err': local variable is initialized but not referenced
+c:\users\layout\desktop\latino\src\regex-2.7-src\src\regexec.c(2203): warning C4701: potentially uninitialized local variable 'local_sctx' used
+  regex2.vcxproj -> C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\Debug\regex2.lib
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/regex-2.7-src/src/regex2.dir/Debug/regex2.tlog/regex2.lastbuildstate b/visualstudio/src/regex-2.7-src/src/regex2.dir/Debug/regex2.tlog/regex2.lastbuildstate
index fbdb90b3..c5c7385c 100644
--- a/visualstudio/src/regex-2.7-src/src/regex2.dir/Debug/regex2.tlog/regex2.lastbuildstate
+++ b/visualstudio/src/regex-2.7-src/src/regex2.dir/Debug/regex2.tlog/regex2.lastbuildstate
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 #TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native64Bit:WindowsTargetPlatformVersion=10.0.17763.0
 Debug|x64|C:\Users\ciber\src\latino\visualstudio\|
+=======
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
+Debug|Win32|C:\Users\Layout\Desktop\Latino\visualstudio\|
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
diff --git a/visualstudio/src/regex-2.7-src/src/regex2.vcxproj b/visualstudio/src/regex-2.7-src/src/regex2.vcxproj
index 4b46600e..c90621cd 100644
--- a/visualstudio/src/regex-2.7-src/src/regex2.vcxproj
+++ b/visualstudio/src/regex-2.7-src/src/regex2.vcxproj
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -49,6 +50,55 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+=======
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MinSizeRel|Win32">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DCFCE55C-2648-3C4F-9DF0-B0F15B269BF5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>Win32</Platform>
+    <ProjectName>regex2</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -59,6 +109,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+<<<<<<< HEAD
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">regex2.dir\Debug\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">regex2</TargetName>
@@ -80,6 +131,29 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
+=======
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">regex2.dir\Debug\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">regex2</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">regex2.dir\Release\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">regex2</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\MinSizeRel\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">regex2.dir\MinSizeRel\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">regex2</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\RelWithDebInfo\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">regex2.dir\RelWithDebInfo\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">regex2</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.lib</TargetExt>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -89,7 +163,12 @@
       <Optimization>Disabled</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -97,10 +176,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -108,6 +194,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -115,6 +202,15 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -122,7 +218,12 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -132,10 +233,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -143,6 +251,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -150,6 +259,15 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -157,7 +275,12 @@
       <Optimization>MinSpace</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -167,10 +290,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -178,6 +308,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -185,6 +316,15 @@
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <CompileAs>CompileAsC</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <ExceptionHandling>
@@ -193,7 +333,12 @@
       <Optimization>MaxSpeed</Optimization>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+<<<<<<< HEAD
       <SuppressStartupBanner></SuppressStartupBanner>
+=======
+      <SuppressStartupBanner>
+      </SuppressStartupBanner>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -201,10 +346,17 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_DEBUG;__STDC_CONSTANT_MACROS;__STDC_FORMAT_MACROS;__STDC_LIMIT_MACROS;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>C:\Users\ciber\src\latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -212,6 +364,7 @@
       <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     </Midl>
     <Lib>
+<<<<<<< HEAD
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -220,6 +373,16 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/regex-2.7-src/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src\CMakeLists.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/regex-2.7-src/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -227,12 +390,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:/Users/ciber/src/latino/src/regex-2.7-src/src/CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/regex-2.7-src/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/regex-2.7-src/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -240,12 +412,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:/Users/ciber/src/latino/src/regex-2.7-src/src/CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/regex-2.7-src/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/regex-2.7-src/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -253,12 +434,21 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:/Users/ciber/src/latino/src/regex-2.7-src/src/CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">Building Custom Rule C:/Users/ciber/src/latino/src/regex-2.7-src/src/CMakeLists.txt</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">setlocal
 C:\bin\CMake\bin\cmake.exe -SC:/Users/ciber/src/latino -BC:/Users/ciber/src/latino/visualstudio --check-stamp-file C:/Users/ciber/src/latino/visualstudio/src/regex-2.7-src/src/CMakeFiles/generate.stamp
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">Building Custom Rule C:/Users/Layout/Desktop/Latino/src/regex-2.7-src/src/CMakeLists.txt</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">setlocal
+"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Layout/Desktop/Latino -BC:/Users/Layout/Desktop/Latino/visualstudio --check-stamp-file C:/Users/Layout/Desktop/Latino/visualstudio/src/regex-2.7-src/src/CMakeFiles/generate.stamp
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -266,6 +456,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
+<<<<<<< HEAD
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:/Users/ciber/src/latino/src/regex-2.7-src/src/CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\ciber\src\latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
@@ -277,6 +468,19 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   <ItemGroup>
     <ProjectReference Include="C:\Users\ciber\src\latino\visualstudio\ZERO_CHECK.vcxproj">
       <Project>{EFC1E963-EF0A-336A-AFBC-9542D6B04179}</Project>
+=======
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Layout\Desktop\Latino\visualstudio\src\regex-2.7-src\src\CMakeFiles\generate.stamp</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkObjects>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src\regex.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="C:\Users\Layout\Desktop\Latino\visualstudio\ZERO_CHECK.vcxproj">
+      <Project>{028B1569-BCE1-3C7C-A3AC-45D14029C3D5}</Project>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/visualstudio/src/regex-2.7-src/src/regex2.vcxproj.filters b/visualstudio/src/regex-2.7-src/src/regex2.vcxproj.filters
index 5984b267..a96acba7 100644
--- a/visualstudio/src/regex-2.7-src/src/regex2.vcxproj.filters
+++ b/visualstudio/src/regex-2.7-src/src/regex2.vcxproj.filters
@@ -1,16 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="C:\Users\ciber\src\latino\src\regex-2.7-src\src\regex.c">
+=======
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src\regex.c">
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+<<<<<<< HEAD
     <CustomBuild Include="C:\Users\ciber\src\latino\src\regex-2.7-src\src\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{FB96B692-61CB-3380-8CD7-8D3A2CF7BF0D}</UniqueIdentifier>
+=======
+    <CustomBuild Include="C:\Users\Layout\Desktop\Latino\src\regex-2.7-src\src\CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{C4DFCDA0-16BB-324F-A53D-85B751345149}</UniqueIdentifier>
+>>>>>>> 11336ac9485c6d839841852720d6c6d0098511a2
     </Filter>
   </ItemGroup>
 </Project>