From c27993c85a9daec2b7152da9de5ee1593a3d3b64 Mon Sep 17 00:00:00 2001
From: Daniel Zendejas <daniel8647@hotmail.com>
Date: Wed, 23 Jul 2014 13:27:53 -0500
Subject: [json/es] Spanish translation for JSON

---
 es-es/json-es.html.markdown | 59 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 es-es/json-es.html.markdown

diff --git a/es-es/json-es.html.markdown b/es-es/json-es.html.markdown
new file mode 100644
index 00000000..c3294636
--- /dev/null
+++ b/es-es/json-es.html.markdown
@@ -0,0 +1,59 @@
+---
+language: json
+filename: learnjson.json
+contributors:
+  - ["Anna Harren", "https://github.com/iirelu"]
+  - ["Marco Scannadinari", "https://github.com/marcoms"]
+translators:
+  -["Daniel Zendejas","https://github.com/DanielZendejas"]
+lang: es-es
+---
+
+Siendo JSON un formato de intercambio de infomación tan sencillo, probablemente este será el Learn X in Y más sencillo jamás.
+
+JSON en su forma más pura no tiene comentarios, pero la mayoría de los parseadores aceptarán comentarios de C (//, /\* \*/). De todas formas, para el propóstio de esto todo será JSON 100% válido. Por suerte, habla por sí mismo.
+
+```json
+
+{
+  "llave": "valor",
+  
+  "llaves": "siempre debe estar entre comillas (ya sean dobles o simples)",
+  "numeros": 0,
+  "strings": "Høla, múndo. Todo el unicode está permitido, así como \"escapar\".",
+  "soporta booleanos?": true,
+  "vacios": null,
+
+  "numero grande": 1.2e+100,
+
+  "objetos": {
+    "comentario": "La mayoria de tu estructura vendra de objetos.",
+
+    "arreglo": [0, 1, 2, 3, "Los arreglos pueden contener cualquier cosa.", 5],
+
+    "otro objeto": {
+      "comentario": "Estas cosas pueden estar anidadas, muy util."
+    }
+  },
+
+  "tonteria": [
+    {
+      "fuentes de potasio": ["bananas"]
+    },
+    [
+      [1, 0, 0, 0],
+      [0, 1, 0, 0],
+      [0, 0, 1, "neo"],
+      [0, 0, 0, 1]
+    ]
+  ],
+  
+  "estilo alternativo": {
+    "comentario": "Mira esto!"
+  , "posicion de la coma": "no importa - mientras este antes del valor, entonces sera valido"
+  , "otro comentario": "que lindo"
+  },
+
+  "eso fue rapido": "Y, estas listo. Ahora sabes todo lo que JSON tiene para ofrecer."
+}
+```
-- 
cgit v1.2.3


From 29858f6845a5b1982b1ba746d0cad4d41240bfa4 Mon Sep 17 00:00:00 2001
From: Daniel Zendejas <daniel8647@hotmail.com>
Date: Wed, 23 Jul 2014 13:28:55 -0500
Subject: Update json-es.html.markdown

---
 es-es/json-es.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es-es/json-es.html.markdown b/es-es/json-es.html.markdown
index c3294636..de52f76d 100644
--- a/es-es/json-es.html.markdown
+++ b/es-es/json-es.html.markdown
@@ -5,7 +5,7 @@ contributors:
   - ["Anna Harren", "https://github.com/iirelu"]
   - ["Marco Scannadinari", "https://github.com/marcoms"]
 translators:
-  -["Daniel Zendejas","https://github.com/DanielZendejas"]
+  - ["Daniel Zendejas","https://github.com/DanielZendejas"]
 lang: es-es
 ---
 
-- 
cgit v1.2.3


From 19a5676798f2315778d07e9271fd5e9d750bb5ef Mon Sep 17 00:00:00 2001
From: Daniel Zendejas <daniel8647@hotmail.com>
Date: Wed, 23 Jul 2014 19:07:48 -0500
Subject: Update json-es.html.markdown

---
 es-es/json-es.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es-es/json-es.html.markdown b/es-es/json-es.html.markdown
index de52f76d..fff678eb 100644
--- a/es-es/json-es.html.markdown
+++ b/es-es/json-es.html.markdown
@@ -1,6 +1,6 @@
 ---
 language: json
-filename: learnjson.json
+filename: learnjson-es.json
 contributors:
   - ["Anna Harren", "https://github.com/iirelu"]
   - ["Marco Scannadinari", "https://github.com/marcoms"]
-- 
cgit v1.2.3


From 2c511db07ac4cc4d4fa8f438a200d4fb98a80884 Mon Sep 17 00:00:00 2001
From: Daniel Zendejas <daniel8647@hotmail.com>
Date: Wed, 23 Jul 2014 20:19:10 -0500
Subject: Create markdown-es.html.markdown

---
 es-es/markdown-es.html.markdown | 234 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 234 insertions(+)
 create mode 100644 es-es/markdown-es.html.markdown

diff --git a/es-es/markdown-es.html.markdown b/es-es/markdown-es.html.markdown
new file mode 100644
index 00000000..c7d408b5
--- /dev/null
+++ b/es-es/markdown-es.html.markdown
@@ -0,0 +1,234 @@
+<!-- Markdown is a superset of HTML, so any HTML file is valid Markdown, that
+means we can use HTML elements in Markdown, such as the comment element, and
+they won't be affected by a markdown parser. However, if you create an HTML
+element in your markdown file, you cannot use markdown syntax within that
+element's contents. -->
+
+<!-- Markdown está basado en HTML, así que cualquier archivo HTML es Markdown
+válido, eso significa que 
+
+-->
+
+<!-- Markdown also varies in implementation from one parser to a next. This
+guide will attempt to clarify when features are universal or when they are
+specific to a certain parser. -->
+
+<!-- Headers -->
+<!-- You can create HTML elements <h1> through <h6> easily by prepending the
+text you want to be in that element by a number of hashes (#) -->
+# This is an <h1>
+## This is an <h2>
+### This is an <h3>
+#### This is an <h4>
+##### This is an <h5>
+###### This is an <h6>
+
+<!-- Markdown also provides us with two alternative ways of indicating h1 and h2 -->
+This is an h1
+=============
+
+This is an h2
+-------------
+
+<!-- Simple text styles -->
+<!-- Text can be easily styled as italic, bold, or strikethrough using markdown -->
+
+*This text is in italics.*
+_And so is this text._
+
+**This text is in bold.**
+__And so is this text.__
+
+***This text is in both.***
+**_As is this!_**
+*__And this!__*
+
+<!-- In Github Flavored Markdown, which is used to render markdown files on
+Github, we also have: -->
+
+~~This text is rendered with strikethrough.~~
+
+<!-- Paragraphs are a one or multiple adjacent lines of text separated by one or
+multiple blank lines. -->
+
+This is a paragraph. I'm typing in a paragraph isn't this fun?
+
+Now I'm in paragraph 2.
+I'm still in paragraph 2 too!
+
+
+I'm in paragraph three!
+
+<!-- Should you ever want to insert an HTML <br /> tag, you can end a paragraph
+with two or more spaces and then begin a new paragraph. -->
+
+I end with two spaces (highlight me to see them).  
+
+There's a <br /> above me!
+
+<!-- Block quotes are easy and done with the > character. -->
+
+> This is a block quote. You can either
+> manually wrap your lines and put a `>` before every line or you can let your lines get really long and wrap on their own.
+> It doesn't make a difference so long as they start with a `>`.
+
+> You can also use more than one level
+>> of indentation?
+> How neat is that?
+
+<!-- Lists -->
+<!-- Unordered lists can be made using asterisks, pluses, or hyphens -->
+
+* Item
+* Item
+* Another item
+
+or
+
++ Item
++ Item
++ One more item
+
+or 
+
+- Item
+- Item
+- One last item
+
+<!-- Ordered lists are done with a number followed by a period -->
+
+1. Item one
+2. Item two
+3. Item three
+
+<!-- You don't even have to label the items correctly and markdown will still
+render the numbers in order, but this may not be a good idea -->
+
+1. Item one
+1. Item two
+1. Item three
+<!-- (This renders the same as the above example) -->
+
+<!-- You can also use sublists -->
+
+1. Item one
+2. Item two
+3. Item three
+    * Sub-item
+    * Sub-item
+4. Item four
+
+<!-- Code blocks -->
+<!-- You can indicate a code block (which uses the <code> element) by indenting
+a line with four spaces or a tab -->
+
+    This is code
+    So is this
+
+<!-- You can also re-tab (or add an additional four spaces) for indentation
+inside your code -->
+
+    my_array.each do |item|
+        puts item
+    end
+
+<!-- Inline code can be created using the backtick character ` -->
+
+John didn't even know what the `go_to()` function did!
+
+<!-- In Github Flavored Markdown, you can use a special syntax for code -->
+
+\`\`\`ruby <!-- except remove those backslashes when you do this, just ```ruby ! -->
+def foobar
+    puts "Hello world!"
+end
+\`\`\` <!-- here too, no backslashes, just ``` -->
+
+<-- The above text doesn't require indenting, plus Github will use syntax
+highlighting of the language you specify after the ``` -->
+
+<!-- Horizontal rule (<hr />) -->
+<!-- Horizontal rules are easily added with three or more asterisks or hyphens,
+with or without spaces. -->
+
+***
+---
+- - - 
+****************
+
+<!-- Links -->
+<!-- One of the best things about markdown is how easy it is to make links. Put
+the text to display in hard brackets [] followed by the url in parentheses () -->
+
+[Click me!](http://test.com/)
+
+<!-- You can also add a link title using quotes inside the parentheses -->
+
+[Click me!](http://test.com/ "Link to Test.com")
+
+<!-- Relative paths work too. -->
+
+[Go to music](/music/).
+
+<!-- Markdown also supports reference style links -->
+
+[Click this link][link1] for more info about it!
+[Also check out this link][foobar] if you want to.
+
+
+
+
+<!-- The title can also be in single quotes or in parentheses, or omitted
+entirely. The references can be anywhere in your document and the reference IDs
+can be anything so long as they are unique. -->
+
+<!-- There is also "implicit naming" which lets you use the link text as the id -->
+
+[This][] is a link.
+
+
+
+<!-- But it's not that commonly used. -->
+
+<!-- Images -->
+<!-- Images are done the same way as links but with an exclamation point in front! -->
+
+![This is hover-text (alt text) for my image](http://imgur.com/myimage.jpg "An optional title")
+
+<!-- And reference style works as expected -->
+
+![This is the hover-text.][myimage]
+
+
+
+<!-- Miscellany -->
+<!-- Auto-links -->
+
+<http://testwebsite.com/> is equivalent to
+[http://testwebsite.com/](http://testwebsite.com/)
+
+<!-- Auto-links for emails -->
+
+<foo@bar.com>
+
+<!-- Escaping characters -->
+
+I want to type *this text surrounded by asterisks* but I don't want it to be
+in italics, so I do this: \*this text surrounded by asterisks\*.
+
+<!-- Tables -->
+<!-- Tables are only available in Github Flavored Markdown and are slightly
+cumbersome, but if you really want it: -->
+
+| Col1         | Col2     | Col3          |
+| :----------- | :------: | ------------: |
+| Left-aligned | Centered | Right-aligned |
+| blah         | blah     | blah          |
+
+<!-- or, for the same results -->
+
+Col 1 | Col2 | Col3
+:-- | :-: | --:
+Ugh this is so ugly | make it | stop
+
+<!-- The end! -->
-- 
cgit v1.2.3


From 4bf1ed2fedcb916b26f92a744d2a20c6bc9f6652 Mon Sep 17 00:00:00 2001
From: Daniel Zendejas <daniel8647@hotmail.com>
Date: Wed, 23 Jul 2014 21:48:35 -0500
Subject: Completed translation

---
 es-es/markdown-es.html.markdown | 255 ++++++++++++++++++++--------------------
 1 file changed, 126 insertions(+), 129 deletions(-)

diff --git a/es-es/markdown-es.html.markdown b/es-es/markdown-es.html.markdown
index c7d408b5..ae7b201b 100644
--- a/es-es/markdown-es.html.markdown
+++ b/es-es/markdown-es.html.markdown
@@ -1,234 +1,231 @@
-<!-- Markdown is a superset of HTML, so any HTML file is valid Markdown, that
-means we can use HTML elements in Markdown, such as the comment element, and
-they won't be affected by a markdown parser. However, if you create an HTML
-element in your markdown file, you cannot use markdown syntax within that
-element's contents. -->
-
 <!-- Markdown está basado en HTML, así que cualquier archivo HTML es Markdown
-válido, eso significa que 
-
--->
+válido, eso significa que podemos usar elementos HTML en Markdown como, por
+ejemplo, el comentario y no serán afectados por un parseador Markdown. Aún 
+así si creas un elemento HTML en tu archivo Markdown no podrás usar sintaxis
+Markdown dentro de él. -->
 
-<!-- Markdown also varies in implementation from one parser to a next. This
-guide will attempt to clarify when features are universal or when they are
-specific to a certain parser. -->
+<!-- La implementación de Markdown cambia de acuerdo al parseador. Esta
+guía servirá para clarificar cuales características son universales y
+cuales son específicas de cada parseador-->
 
 <!-- Headers -->
-<!-- You can create HTML elements <h1> through <h6> easily by prepending the
-text you want to be in that element by a number of hashes (#) -->
-# This is an <h1>
-## This is an <h2>
-### This is an <h3>
-#### This is an <h4>
-##### This is an <h5>
-###### This is an <h6>
-
-<!-- Markdown also provides us with two alternative ways of indicating h1 and h2 -->
-This is an h1
+<!-- Puedes crear headers HTML fácilmente precediendo al texto con una serie
+de símbolos de números (#)-->
+
+# Esto es un <h1>
+## Esto es un <h2>
+### Esto es un <h3>
+#### Esto es un <h4>
+##### Esto es un <h5>
+###### Esto es un <h6>
+
+<!-- Markdown también nos proveé con dos alternativas para indicar h1 y h2 -->
+Esto es un h1
 =============
 
-This is an h2
+Esto es un h2
 -------------
 
-<!-- Simple text styles -->
-<!-- Text can be easily styled as italic, bold, or strikethrough using markdown -->
-
-*This text is in italics.*
-_And so is this text._
+<!-- Estilos para texto plano -->
+<!-- El texto puede ser fácilmente estilizaedo con italicas, negritas o tachado 
+usando markdown -->
 
-**This text is in bold.**
-__And so is this text.__
+*Este texto está en itálicas.*
+_Al igual que este texto._
 
-***This text is in both.***
-**_As is this!_**
-*__And this!__*
+**Este texto está en negritas.**
+__Al igual que este texto.__
 
-<!-- In Github Flavored Markdown, which is used to render markdown files on
-Github, we also have: -->
+***Este texto tiene ambos estilos.***
+**_Al igual que este!_**
+*__¡Y este!__*
 
-~~This text is rendered with strikethrough.~~
+<!-- En Github Flavored Markdown, el cual es usado para mostrar archivos 
+Markdown en Github, también tenemos: -->
 
-<!-- Paragraphs are a one or multiple adjacent lines of text separated by one or
-multiple blank lines. -->
+~~Este texto está tachado.~~
 
-This is a paragraph. I'm typing in a paragraph isn't this fun?
+<!-- Los párrafos son una o múltuples líneas de texto adyacentes separadas por 
+una o múltiples líneas en blanco-->
 
-Now I'm in paragraph 2.
-I'm still in paragraph 2 too!
+Este es un párrafo. Estoy escribiendo un párrafo, ¿No es divertido?
 
+Ahora estoy en el párrafo dos.
+¡Sigo en el párrafo dos!
 
-I'm in paragraph three!
+¡Estoy en el párrafo tres!
 
-<!-- Should you ever want to insert an HTML <br /> tag, you can end a paragraph
-with two or more spaces and then begin a new paragraph. -->
+<!-- Si en algún momento quieres insertar un break HTML <br />, puedes terminar
+un párrafo con dos o más espacios y luego empieza un párrafo nuevo-->
 
-I end with two spaces (highlight me to see them).  
+Termino con dos espacios (selecciona esta línea completa para que los veas).  
 
-There's a <br /> above me!
+¡Hay un <br /> arriba de mí!
 
-<!-- Block quotes are easy and done with the > character. -->
+<!-- Las citas de bloque son fáciles y se pueden hacer con el caracter >. -->
 
-> This is a block quote. You can either
-> manually wrap your lines and put a `>` before every line or you can let your lines get really long and wrap on their own.
-> It doesn't make a difference so long as they start with a `>`.
+> Esta es una cita de bloque. Puedes
+> envolver tus líneas manualmente y poner un `>` antes de cada línea o puedes dejar que tus líneas sean muy largas y que se envuelvan solas.
+> No hay diferencia, siempre y cuando empiecen con `>`.
 
-> You can also use more than one level
->> of indentation?
-> How neat is that?
+> ¿También puedes usar más de un nivel
+>> de indentación?
+> Esto es muy útil ¿No?
 
-<!-- Lists -->
-<!-- Unordered lists can be made using asterisks, pluses, or hyphens -->
+<!-- Listas -->
+<!-- Las listas desordenadas se hacen usando asteriscos, símbolos de más,
+ o guiones -->
 
 * Item
 * Item
-* Another item
+* Otro item
 
-or
+o
 
 + Item
 + Item
-+ One more item
++ Un item más
 
-or 
+o
 
 - Item
 - Item
-- One last item
+- El último item
 
-<!-- Ordered lists are done with a number followed by a period -->
+<!-- Las listas ordenadas se logran con un número seguido de un punto -->
 
-1. Item one
-2. Item two
-3. Item three
+1. Item uno
+2. Item dos
+3. Item tres
 
-<!-- You don't even have to label the items correctly and markdown will still
-render the numbers in order, but this may not be a good idea -->
+<!-- Aunque Markdown mostrará los items correctamente en orden, esto no
+es una buena idea -->
 
-1. Item one
-1. Item two
-1. Item three
-<!-- (This renders the same as the above example) -->
+1. Item uno
+1. Item dos
+1. Item tres
+<!-- (Esto muestra lo mismo que el ejemplo de arriba) -->
 
-<!-- You can also use sublists -->
+<!-- También puedes usar sub-listas -->
 
-1. Item one
-2. Item two
-3. Item three
+1. Item uno
+2. Item dos
+3. Item tres
     * Sub-item
     * Sub-item
-4. Item four
+4. Item cuatro
 
-<!-- Code blocks -->
-<!-- You can indicate a code block (which uses the <code> element) by indenting
-a line with four spaces or a tab -->
+<!-- Bloques de código -->
+<!-- Puedes indicar un bloque de código (usan los elementos <code>) indentando 
+una línea con cuatro espacios o un tab-->
 
-    This is code
-    So is this
+    Esto es código
+    Esto también
 
-<!-- You can also re-tab (or add an additional four spaces) for indentation
-inside your code -->
+<!-- También puedes insertar dos tabs (o cuatro espacios adicionales)
+para indentar dentro del código -->
 
     my_array.each do |item|
         puts item
     end
 
-<!-- Inline code can be created using the backtick character ` -->
+<!-- Código dentro de la línea puede ser escrito usando la comilla ` -->
 
-John didn't even know what the `go_to()` function did!
+¡John no sabía lo que la función `go_to()` hacía!
 
-<!-- In Github Flavored Markdown, you can use a special syntax for code -->
+<!-- Con Github Flavored Markdown, puedes usar una sintaxis especial para código -->
 
-\`\`\`ruby <!-- except remove those backslashes when you do this, just ```ruby ! -->
+\`\`\`ruby <!-- quita esas comillas cuando lo hagas, deja sólo ```ruby ! -->
 def foobar
     puts "Hello world!"
 end
-\`\`\` <!-- here too, no backslashes, just ``` -->
+\`\`\` <!-- aquí también, sin comillas, sólo ``` -->
 
-<-- The above text doesn't require indenting, plus Github will use syntax
-highlighting of the language you specify after the ``` -->
+<!-- El texto de arriba no necesita indentación, aparte Github usará
+resaltará la sintaxis del lenguaje que especifiques después de ``` -->
 
-<!-- Horizontal rule (<hr />) -->
-<!-- Horizontal rules are easily added with three or more asterisks or hyphens,
-with or without spaces. -->
+<!-- Regla horizontal (<hr />) -->
+<!-- Las reglas horizontales se agregan fácilmente con tres o más asteriscos o guiones,
+con o sin espacios. -->
 
 ***
 ---
 - - - 
 ****************
 
-<!-- Links -->
-<!-- One of the best things about markdown is how easy it is to make links. Put
-the text to display in hard brackets [] followed by the url in parentheses () -->
+<!-- Ligas -->
+<!-- Una de las mejores cosas de Markdown es la facilidad para hacer ligas. Pon
+el texto a mostrar en corchetes [] seguidos por la URL en paréntesis () -->
 
-[Click me!](http://test.com/)
+[¡Haz click!](http://test.com/)
 
-<!-- You can also add a link title using quotes inside the parentheses -->
+<!-- También puedes agregar el titulo de la liga usando comillas dentro de los paréntesis -->
 
-[Click me!](http://test.com/ "Link to Test.com")
+[¡Haz click!](http://test.com/ "Liga al test.com")
 
-<!-- Relative paths work too. -->
+<!-- También funcionan las rutas relativas. -->
 
-[Go to music](/music/).
+[Ir a la música](/music/).
 
-<!-- Markdown also supports reference style links -->
+<!-- Markdown también soporta ligas con estilo de referencia -->
 
-[Click this link][link1] for more info about it!
-[Also check out this link][foobar] if you want to.
+¡[Has click a esta liga][liga1] para más información!
+[También mira esta liag][foobar] si quieres.
 
 
 
 
-<!-- The title can also be in single quotes or in parentheses, or omitted
-entirely. The references can be anywhere in your document and the reference IDs
-can be anything so long as they are unique. -->
+<!-- El título también puede estar en comillas simples o dentro de paréntesis,
+también se pueden omitir completamente. Las referencias pueden estar en cualquier
+lugar en tu documento y los IDs de referencia pueden ser lo que sea mientras sean únicos. -->
 
-<!-- There is also "implicit naming" which lets you use the link text as the id -->
+<!-- También hay "nombramiento implicito" el cual te permite usar el texto de la liga como id -->
 
-[This][] is a link.
+[Esta][] es una liga.
 
 
 
-<!-- But it's not that commonly used. -->
+<!-- Pero no se usa comúnmente. -->
 
-<!-- Images -->
-<!-- Images are done the same way as links but with an exclamation point in front! -->
+<!-- Imagenes -->
+<!-- Las imagenes se hacen de la misma forma que las ligas pero con un símbolo de exclamaciónal frente! -->
 
-![This is hover-text (alt text) for my image](http://imgur.com/myimage.jpg "An optional title")
+![Esta es una etiqueta (texto alternativo) para mi imagen](http://imgur.com/myimage.jpg "Un titulo opcional")
 
-<!-- And reference style works as expected -->
+<!-- Y el estilo de referencia funciona como se espera -->
 
-![This is the hover-text.][myimage]
+![Esta es una etiqueta.][myimage]
 
 
 
-<!-- Miscellany -->
-<!-- Auto-links -->
+<!-- Misceláneos -->
+<!-- Auto-ligas -->
 
-<http://testwebsite.com/> is equivalent to
+<http://testwebsite.com/> equivale a
 [http://testwebsite.com/](http://testwebsite.com/)
 
-<!-- Auto-links for emails -->
+<!-- Auto-ligas para correos electrónicos -->
 
 <foo@bar.com>
 
-<!-- Escaping characters -->
+<!-- Escapando caracteres -->
 
-I want to type *this text surrounded by asterisks* but I don't want it to be
-in italics, so I do this: \*this text surrounded by asterisks\*.
+Quiero escribir *este texto rodeado por asteriscos* pero no quiero que esté en itálicas,
+así que hago esto: \*Este texto está rodeado de asteriscos\*.
 
-<!-- Tables -->
-<!-- Tables are only available in Github Flavored Markdown and are slightly
-cumbersome, but if you really want it: -->
+<!-- Tablas -->
+<!-- Las tablas sólo están disponibles en Github Flavored Markdown y son un poco pesadas,
+pero si de verdad las quieres: -->
 
 | Col1         | Col2     | Col3          |
 | :----------- | :------: | ------------: |
-| Left-aligned | Centered | Right-aligned |
+| Izquierda | Centrado | Derecha |
 | blah         | blah     | blah          |
 
-<!-- or, for the same results -->
+<!-- o, para los mismos resultados -->
 
 Col 1 | Col2 | Col3
 :-- | :-: | --:
-Ugh this is so ugly | make it | stop
+Ugh esto es feo | has que | pare.
 
-<!-- The end! -->
+<!-- ¡El fin! -->
-- 
cgit v1.2.3


From a5ca7174262e9fe73d4f9ed9aafafab4c9ae91a9 Mon Sep 17 00:00:00 2001
From: Daniel Zendejas <daniel8647@hotmail.com>
Date: Wed, 23 Jul 2014 21:51:26 -0500
Subject: Added translation and format

---
 es-es/markdown-es.html.markdown | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/es-es/markdown-es.html.markdown b/es-es/markdown-es.html.markdown
index ae7b201b..fd901cf4 100644
--- a/es-es/markdown-es.html.markdown
+++ b/es-es/markdown-es.html.markdown
@@ -1,3 +1,18 @@
+---
+language: markdown
+contributors:
+    - ["Dan Turkel", "http://danturkel.com/"]
+translators:
+    - ["Daniel Zendejas", "https://github.com/DanielZendejas"]
+-filename: es-markdown.md
+---
+
+Markdown was created by John Gruber in 2004. It's meant to be an easy to read and write syntax which converts easily to HTML (and now many other formats as well).
+
+Give me as much feedback as you want! / Feel free to fork and pull request!
+
+
+```
 <!-- Markdown está basado en HTML, así que cualquier archivo HTML es Markdown
 válido, eso significa que podemos usar elementos HTML en Markdown como, por
 ejemplo, el comentario y no serán afectados por un parseador Markdown. Aún 
@@ -229,3 +244,7 @@ Col 1 | Col2 | Col3
 Ugh esto es feo | has que | pare.
 
 <!-- ¡El fin! -->
+
+```
+
+For more info, check out John Gruber's official post of syntax [here](http://daringfireball.net/projects/markdown/syntax) and Adam Pritchard's great cheatsheet [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
-- 
cgit v1.2.3


From 248ab5a182718be2c63a0b83f7e55ce42afe349c Mon Sep 17 00:00:00 2001
From: Daniel Zendejas <daniel8647@hotmail.com>
Date: Wed, 23 Jul 2014 21:52:43 -0500
Subject: Added lang

---
 es-es/markdown-es.html.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/es-es/markdown-es.html.markdown b/es-es/markdown-es.html.markdown
index fd901cf4..1ffe148e 100644
--- a/es-es/markdown-es.html.markdown
+++ b/es-es/markdown-es.html.markdown
@@ -1,10 +1,11 @@
 ---
 language: markdown
+filename: markdown-es.md
 contributors:
     - ["Dan Turkel", "http://danturkel.com/"]
 translators:
     - ["Daniel Zendejas", "https://github.com/DanielZendejas"]
--filename: es-markdown.md
+lang: es-es
 ---
 
 Markdown was created by John Gruber in 2004. It's meant to be an easy to read and write syntax which converts easily to HTML (and now many other formats as well).
-- 
cgit v1.2.3


From 49c2fb948dd77413fe3cedc961ad4ed428b6c9ef Mon Sep 17 00:00:00 2001
From: Daniel Zendejas <daniel8647@hotmail.com>
Date: Wed, 23 Jul 2014 21:56:21 -0500
Subject: Update markdown-es.html.markdown

---
 es-es/markdown-es.html.markdown | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/es-es/markdown-es.html.markdown b/es-es/markdown-es.html.markdown
index 1ffe148e..228e0a18 100644
--- a/es-es/markdown-es.html.markdown
+++ b/es-es/markdown-es.html.markdown
@@ -10,7 +10,10 @@ lang: es-es
 
 Markdown was created by John Gruber in 2004. It's meant to be an easy to read and write syntax which converts easily to HTML (and now many other formats as well).
 
-Give me as much feedback as you want! / Feel free to fork and pull request!
+Markdown fue creado por John Gruber en 2004. Su propósito es ser una sintaxis fácil de leer y escribir que se convierta
+fácilmente a HTML (y, actualmente, otros formatos también).
+
+¡Denme todo la retroalimentación que quieran! / ¡Sientanse en la libertad de hacer forks o pull requests!
 
 
 ```
@@ -248,4 +251,4 @@ Ugh esto es feo | has que | pare.
 
 ```
 
-For more info, check out John Gruber's official post of syntax [here](http://daringfireball.net/projects/markdown/syntax) and Adam Pritchard's great cheatsheet [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
+Para más información, mira el post oficial de John Gruber's [aquí](http://daringfireball.net/projects/markdown/syntax) y la gran referencia de Adam Pritchard's [aquí](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
-- 
cgit v1.2.3


From 41406fdce69c5a7dece0938f522a3c3a8b5c6c6f Mon Sep 17 00:00:00 2001
From: Daniel Zendejas <daniel8647@hotmail.com>
Date: Wed, 23 Jul 2014 21:56:46 -0500
Subject: finalizado

---
 es-es/markdown-es.html.markdown | 2 --
 1 file changed, 2 deletions(-)

diff --git a/es-es/markdown-es.html.markdown b/es-es/markdown-es.html.markdown
index 228e0a18..3865126c 100644
--- a/es-es/markdown-es.html.markdown
+++ b/es-es/markdown-es.html.markdown
@@ -8,8 +8,6 @@ translators:
 lang: es-es
 ---
 
-Markdown was created by John Gruber in 2004. It's meant to be an easy to read and write syntax which converts easily to HTML (and now many other formats as well).
-
 Markdown fue creado por John Gruber en 2004. Su propósito es ser una sintaxis fácil de leer y escribir que se convierta
 fácilmente a HTML (y, actualmente, otros formatos también).
 
-- 
cgit v1.2.3