conflict solved

Author: tommygonzaleza

.gitignore

@@ -7,7 +7,7 @@
 !bc.json
 !learn.json
 !README.md
-!README.*.md
+!README.es.md
 
 !/exercises
 !/exercises/*

.gitpod.Dockerfile

@@ -4,5 +4,5 @@ FROM gitpod/workspace-full:latest
 USER gitpod
 
 RUN pip3 install pytest==4.4.2 pytest-testdox mock
-RUN npm i learnpack@0.1.19 -g && learnpack plugins:install learnpack-python@0.0.36
+RUN npm i @learnpack/learnpack -g && learnpack plugins:install learnpack-python@0.0.36
 

.gitpod.yml

@@ -7,7 +7,7 @@ ports:
 
 vscode:
   extensions:
-    - learnpack.learnpack-vscode
+    - learn-pack.learnpack-vscode
 
 github:
     prebuilds:

README.es.md

@@ -0,0 +1,64 @@
+<!-- hide -->
+# 🐍 Tutorial Master Python
+
+<p>Por <a href="https://twitter.com/alesanchezr">@alesanchezr</a> y <a href="https://github.com/4GeeksAcademy//master-python-programming-exercises/graphs/contributors">otros colaboradores</a> de <a href="http://4geeksacademy.co/">4Geeks Academy</a><a href="https://www.4geeksacademy.co"><img height="280" align="right" src="https://raw.githubusercontent.com/ElviraQDP/master-python-programming-exercises/master/badge-master-python.png"></a>
+ 
+<!-- endhide -->
+ 
+Después de terminar la serie de principiantes, funciones y bucles; Esta serie realmente lo preparará para su próximo trabajo o cualquier otro desafío de programación. Practique todo lo que necesita saber para construir algoritmos con python, desde desafíos intermedios hasta difíciles: todo el tutorial es 👆 interactivo, ✅ calificado automáticamente y con 📹 videos tutoriales.
+
+<!-- hide -->
+Estos Ejercicios son colaborativos, ¡te necesitamos! Si encuentras algún error o falta de ortografía, por favor contribuye y repórtalo.  
+ 
+## Instalación en un clic:
+ 
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io#https://github.com/4GeeksAcademy/master-python-programming-exercises.git)
+
+
+## Instalación local:
+
+1. Instala learnpack, el administrador de paquetes para tutoriales de aprendizaje y el complemento del compilador html para learnpack, asegúrate de tener también node.js 14+:
+
+```
+$ npm i learnpack -g
+$ learnpack plugins:install learnpack-python
+```
+
+2. Descarga este ejercicio en particular usando learnpack y `cd` para entrar en la carpeta:
+
+```
+$ learnpack download master-python-programming-exercises
+$ cd master-python-programming-exercises
+```
+
+Nota: Una vez que termine de descargar, encontrarás la carpeta "exercises" que contiene todos los ejercicios.
+
+3. Comienza con los ejercicios ejecutando el siguiente en el mismo nivel que tu archivo learn.json:
+
+```sh
+$ RUN  pip3 install pytest==4.4.2 pytest-testdox mock
+$ learnpack start
+```
+<!-- endhide -->
+Note: The exercises have automatic grading but its very rigid and string, my recomendation is to ignore the tests and use them only as a recomendation or you can get frustrated.
+
+
+## ¿Cómo están organizados los ejercicios?
+
+Cada ejercicio es un pequeño proyecto en Python que contiene los siguientes archivos:
+
+1. **app.py:** representa el archivo de entrada de python que será ejecutado en el computador.
+2. **README.md:** contiene las instrucciones del ejercicio.
+3. **test.py:** no tienes que abrir este archivo. Contiene los scripts de pruebas del ejercicio.
+
+# Colaboradores
+ 
+Gracias a estas personas maravillosas ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):
+
+1. [Alejandro Sanchez (alesanchezr)](https://github.com/alesanchezr), contribución: (programador) 💻 (idea) 🤔, (build-tests) ⚠️ , (pull-request-review) 🤓 (build-tutorial) ✅ (documentación) 📖
+
+2. [Paolo (plucodev)](https://github.com/plucodev), contribución: (bug reports) 🐛, (programador), (traducción) 🌎
+
+3. [Marco Gómez (marcogonzalo)](https://github.com/marcogonzalo), contribution: (bug reports) 🐛, (translation) 🌎
+
+Este proyecto sigue la especificación [all-contributors](https://github.com/kentcdodds/all-contributors). ¡Todas las contribuciones son bienvenidas!

README.md

@@ -1,34 +1,14 @@
-<table>
-  <tr>
-    <td><img src="https://assets.breatheco.de/apis/img/images.php?blob&random&cat=icon&tags=4geeks,32"></td>
-    <td>
-      <h1> 🐍 Mastering Python Algorithms Tutorial</h1>
-      <p>By <a href="https://twitter.com/alesanchezr">@alesanchezr</a> and <a href="https://github.com/4GeeksAcademy//master-python-programming-exercises/graphs/contributors">other contributors</a> at <a href="http://4geeksacademy.co/">4Geeks Academy</a></p>
-      <img src="https://img.shields.io/github/last-commit/4geeksacademy/master-python-programming-exercises" />
-      <a href="https://breatheco.de"><img src="https://img.shields.io/badge/certified-BreatheCode-blue" /></a>
-      <a href="https://twitter.com/alesanchezr"><img src="https://img.shields.io/twitter/follow/alesanchezr?style=social&logo=twitter" alt="follow on Twitter"></a>
-      <a href="https://gitpod.io#https://github.com/4GeeksAcademy/master-python-programming-exercises.git"><img src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod" /></a>
-    </td>
-  </tr>
-</table>
+<!-- hide -->
+# 🐍 Mastering Python Algorithms Tutorial
 
-After you finished the begginers, functions and loops series; This series will really prepare you for your next job or any any other programming challenge. Practice everything there you need to know to build algorithms with python, from intermadiate to hard challenges: The entire tutorial is 👆 interactive, ✅ auto-graded and with. 📹 video tutorials.
+By <a href="https://twitter.com/alesanchezr">@alesanchezr</a> and <a href="https://github.com/4GeeksAcademy//master-python-programming-exercises/graphs/contributors">other contributors</a> at <a href="http://4geeksacademy.co/">4Geeks Academy</a>
+
+<a href="https://www.4geeksacademy.co"><img height="280" align="right" src="https://raw.githubusercontent.com/4GeeksAcademy/master-python-programming-exercises/master/badge-master-python.png" /></a>
 
-<h3>📚 Table of contents:</h3>
-<table>
-  <tr>
-    <td>1. <a href="https://github.com/4GeeksAcademy/python-beginner-programming-exercises">Python for Beginners</a> </td>
-  </tr>
-  <tr color="white"><td>2. <a href="https://github.com/4GeeksAcademy/python-lists-loops-programming-exercises">Practice Looping Lists and Tuples</a></td></tr>
-  <tr><td>3. <a href="https://github.com/4GeeksAcademy/python-functions-programming-exercises">Practice functions</a></td></tr>
-  <tr><td>4. <a href="https://github.com/4GeeksAcademy/master-python-programming-exercises">Master Python (intermediate)</a></td>
-<td>← 🔥 your are here now</td>
-    <td><a href="https://gitpod.io#https://github.com/4GeeksAcademy/master-python-programming-exercises.git"><img src="https://gitpod.io/button/open-in-gitpod.svg" /></a></td>
-  </tr>
-  <tr><td>5. <a href="https://github.com/4GeeksAcademy/python-http-requests-api-tutorial-exercises">Python API Requests</a></td></tr>
-  <tr><td>6. What next? <a href="https://github.com/4GeeksAcademy/About-4Geeks-Academy/issues/new">Request a new tutorial</a> or <a href="https://github.com/4GeeksAcademy/About-4Geeks-Academy/labels/help%20wanted">collaborate</a>.<br /> We will feature your profile in our list of contributors</td></tr>
-</table>
+<!-- endhide -->
+After you finished the begginers, functions and loops series; This series will really prepare you for your next job or any any other programming challenge. Practice everything there you need to know to build algorithms with python, from intermadiate to hard challenges: The entire tutorial is 👆 interactive, ✅ auto-graded and with. 📹 video tutorials.
 
+<!-- hide -->
 These exercises were built in collaboration, we need you! If you find any bugs or misspells plese contribute and report them.
 
 <h2>One click installation:</h2>
@@ -38,7 +18,7 @@ These exercises were built in collaboration, we need you! If you find any bugs o
 
 ## Local Installation
 
-1. Install learnpack, the package manager for learning tutorials and the html compiler plugin for learnpack, make sure you also have node.js 12+:
+1. Install learnpack, the package manager for learning tutorials and the html compiler plugin for learnpack, make sure you also have node.js 14+:
 
 ```
 $ npm i learnpack -g
@@ -61,6 +41,8 @@ $ RUN  pip3 install pytest==4.4.2 pytest-testdox mock
 $ learnpack start
 ```
 
+<!-- endhide -->
+
 Note: The exercises have automatic grading but its very rigid and string, my recomendation is to ignore the tests and use them only as a recomendation or you can get frustrated.
 
 
@@ -76,10 +58,11 @@ Each exercise is a small react application containing the following files:
 
 Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):
 
-1. [Alejandro Sanchez (alesanchezr)](https://github.com/alesanchezr), contribution: (coder) :computer: (idea) 🤔, (build-tests) :warning:, (pull-request-review) :eyes: (build-tutorial) :white_check_mark: (documentation) :book:
-2. [Paolo (plucodev)](https://github.com/plucodev), contribution: (bug reports) :bug:, contribution: (coder), (translation) :earth_americas:
-3. [Marco Gómez (marcogonzalo)](https://github.com/marcogonzalo), contribution: (bug reports) :bug:, (translation) :earth_africa:
+1. [Alejandro Sanchez (alesanchezr)](https://github.com/alesanchezr), contribution: (coder) 💻  (idea) 🤔, (build-tests) ⚠️ , (pull-request-review) 👀 (build-tutorial) ✅ (documentation) 📖
+
+2. [Paolo (plucodev)](https://github.com/plucodev), contribution: (bug reports) 🐛, contribution: (coder), (translation) 🌎
+
+3. [Marco Gómez (marcogonzalo)](https://github.com/marcogonzalo), contribution: (bug reports) :🐛, (translation) 🌎
+
 
-This project follows the
-[all-contributors](https://github.com/kentcdodds/all-contributors)
-specification. Contributions of any kind are welcome!
+This project follows the[all-contributors](https://github.com/kentcdodds/all-contributors) specification.Contributions of any kind are welcome!

exercises/000-welcome/README.es.md

@@ -0,0 +1,16 @@
+# Bienvenid@ a Python!
+
+¡¡Nos estusiasma mucho tenerte aquí!! 🎉 😂
+
+Este es el último de una serie de ejercicios publicados para practicar Python desde cero por [@alesanchezr](https://twitter.com/alesanchezr) y [4GeeksAcademy](https://4geeksacademy.com).
+
+Si no haz completado los otros ejercicios te recomiendo que empieces por alli:
+
+1. [Python for beginners](https://github.com/4GeeksAcademy/python-beginner-programming-exercises)
+
+2. [Practice Looping Lists and Tuples](https://github.com/4GeeksAcademy/python-lists-loops-programming-exercises)
+
+3. [Practice Functions](https://github.com/4GeeksAcademy/python-functions-programming-exercises)
+
+
+Presiona `Next →` en la esquina superior derecha cuando quieras empezar.

exercises/000-welcome/README.md

@@ -0,0 +1,15 @@
+# Welcome to Python!
+
+We are very excited to have you here !! 🎉 😂
+
+This is the last series of exercises of a list of Python interactive tutorials published by [@alesanchezr](https://twitter.com/alesanchezr) with [4GeeksAcademy](https://4geeksacademy.com).
+
+If you have not completed them and you are new to javascript, I strongly recomend you start with:
+
+1. [Python for beginners](https://github.com/4GeeksAcademy/python-beginner-programming-exercises)
+
+2. [Practice Looping Lists and Tuples](https://github.com/4GeeksAcademy/python-lists-loops-programming-exercises)
+
+3. [Practice Functions](https://github.com/4GeeksAcademy/python-functions-programming-exercises)
+
+Click `Next →` on the top right of this instructions when you are ready to start.

exercises/02-hello-world/README.es.md renamed to exercises/001-hello_world/README.es.md

@@ -1,21 +1,21 @@
-# `02` Hola, Mundo
+# `001` hello world
 
 En Python, usamos `print` para hacer que el computador escriba cualquier cosa que queramos (el contenido de una variable, un texto dado, etc.) in algo llamado `la consola`.
 
 Cada idioma tiene funciones para integrarse con la consola, ya que al principio era la única forma de interactuar con los usuarios (antes de que llegara Windows o MacOS o Linux). 
 
-Hoy en día, la impresión en la consola se utiliza sobre todo como herramienta de monitorización, ideal para dejar un rastro del contenido de las variables durante la ejecución del programa.
+Hoy en día, la impresión en la consola se utiliza sobre todo como herramienta de monitoreo, ideal para dejar un rastro del contenido de las variables durante la ejecución del programa.
+
+## Ejemplo:
 
-Este es un ejemplo de cómo usarlo:
 ```py
 print("How are you?")
 ```
 
 ## 📝 Instrucciones:
 
-1. Usa la función `print()` para escribir "Hello World" en la consola. Siéntete libre de intentar otras cosas también.
+1. Usa la función `print()` para escribir `"Hello World"` en la consola. Siéntete libre de intentar otras cosas también.
 
 ## 💡 Pista:
 
-Video de 5 minutos sobre la consola:
-https://www.youtube.com/watch?v=vROGBvX_MHQ
++ Video de 5 minutos sobre [la consola](https://www.youtube.com/watch?v=vROGBvX_MHQ)

exercises/02-hello-world/README.md renamed to exercises/001-hello_world/README.md

@@ -1,12 +1,13 @@
-# `02` Hello World
+# `001` hello world
 
 In Python, we use `print` to make the computer write anything we want (the content of a variable, a given string, etc.) in something called "the console".
 
 Every language has a console, as it was the only way to interact with the users at the beginning (before the Windows or MacOS arrived). 
 
 Today, printing in the console is used mostly as a monitoring tool, ideal to leave a trace of the content of variables during the program execution.
 
-This is an example of how to use it:
+## Example:
+
 ```py
 print("How are you?")
 ```
@@ -17,5 +18,4 @@ print("How are you?")
 
 ## 💡 Hint:
 
-5 minutes video about the console:
-https://www.youtube.com/watch?v=1RlkftxAo-M
++ 5 minutes video about [the console](https://www.youtube.com/watch?v=1RlkftxAo-M)

exercises/02-hello-world/app.py renamed to exercises/001-hello_world/app.py

@@ -0,0 +1,16 @@
+# `002` sum of three numbers
+
+## 📝 Instrucciones:
+
+1. Teniendo tres números de entrada, imprime su suma. Cada número va en una línea aparte.
+
+## Ejemplo de entrada:
+
++ 2
++ 3
++ 6
+
+## Ejemplo de salida:
+
++ 11
+

exercises/02-hello-world/test.py renamed to exercises/001-hello_world/test.py

@@ -1,16 +1,16 @@
-# `03` Sum of three numbers
+# `002` sum of three numbers
 
 ## 📝 Instructions:
 
 1. Taking 3 numbers from the input, print their sum. Every number is given on a separate line.
 
-### Example input:
+## Example input:
 
-- 2
-- 3
-- 6
++ 2
++ 3
++ 6
 
-### Example output:
+## Example output:
 
-- 11
++ 11
 

exercises/002-sum_of_three_numbers/README.es.md

@@ -0,0 +1,19 @@
+# `003` area of right triangle
+
+## 📝 Instrucciones:
+
+1. Completa la función `area_of_triangle()` para que que tome el largo de la base y la altura de un triángulo rectángulo e imprima su área. Cada número es dado en una línea por separado.
+
+![Imagen descriptiva](http://i.imgur.com/6EkzVxA.jpg)
+
+## Ejemplo:
+
+```py
+area_of_triangle(3,5)
+    print(7.5)
+```
+## 💡 Pistas:
+
++ Si no sabes por donde empezar este ejercicio, por favor, revisa la teoría en esta lección: https://snakify.org/lessons/print_input_numbers/
+
++ También puedes intentar paso a paso con trozos de la teoría: https://snakify.org/lessons/print_input_numbers/steps/1/

exercises/03-sum_of_three_numbers/README.md renamed to exercises/002-sum_of_three_numbers/README.md

@@ -0,0 +1,19 @@
+# `003` area of right triangle
+
+## 📝 Instructions:
+
+1. Complete the `area_of_triangle()` function so that it reads the length of the base and the height of a right-angled triangle and prints the area. Every number is given on a separate line.
+
+![Image description](http://i.imgur.com/6EkzVxA.jpg)
+
+## Ejemplo:
+
+```py
+area_of_triangle(3,5)
+    print(7.5)
+```
+## 💡 Hints:
+
++ If you don't know how to start solving this exercise, please, review a theory for this lesson: https://snakify.org/lessons/print_input_numbers/
+
++ You may also try step-by-step theory chunks: https://snakify.org/lessons/print_input_numbers/steps/1/

exercises/03-sum_of_three_numbers/app.py renamed to exercises/002-sum_of_three_numbers/app.py

@@ -0,0 +1,26 @@
+# `004` hello Harry
+
+## 📝 Instrucciones:
+
+1. Completa la función `hello_name()` para que salude al usuario imprimiendo la palabra `Hello`, luego le agregue una coma, el nombre del usuario y un signo de exclamación después de él. 
+
+*La salida de tu función debe coincidir estrictamente con la deseada, caracter por caracter. No debe haber ningún espacio entre el nombre y el signo de exclamación.* 
+
+## Ejemplo entrada:
+
+```py
+hello_name("Harry")
+```
+## Ejemplo de salida:
+
+Hello, Harry!
+
+## 💡 Pistas:
+
++ Puedes usar el operador '+' para concatenar dos strings de texto. Ve la lección para más detalles.
+
++ Si no sabes por donde partir este ejercicio por favor, revisa la teoría en esta lección:
+https://snakify.org/lessons/print_input_numbers/
+
++ También puedes intentar paso a paso con trozos de la teoría:
+https://snakify.org/lessons/print_input_numbers/steps/1/

exercises/03-sum_of_three_numbers/test.py renamed to exercises/002-sum_of_three_numbers/test.py

@@ -0,0 +1,25 @@
+# `004` hello Harry
+
+## 📝 Instructions:
+
+1. Complete the `hello_name()` function that greets the user by printing the word `Hello`, a comma, the name of the user and an exclamation mark after it. 
+
+*Your function's output should strictly match the desired one, character by character. There shouldn't be any space between the name and the exclamation mark.* 
+
+## Example input:
+
+```py
+hello_name("Harry")
+```
+
+## Example output:
+
+Hello, Harry!
+
+## 💡 Hints:
+
++ You can use '+' operator to concatenate two strings. See the lesson for details.
+
++ If you don't know how to start solving this assignment, please, review a theory for this lesson: https://snakify.org/lessons/print_input_numbers/
+
++ You may also try step-by-step theory chunks: https://snakify.org/lessons/print_input_numbers/steps/1/