diff --git a/Default.html b/Default.html
index be22dd7c..ad4c9726 100644
--- a/Default.html
+++ b/Default.html
@@ -1,11 +1,12 @@
-
-Aprendiendo manipular github con rey pila
+
+ Aprendiendo manipular github con rey pila
-Hi everyone i take a course github
-THK
+ 
+ Hi everyone i take a course github
+ THK
\ No newline at end of file
diff --git a/GitForkTest.txt b/GitForkTest.txt
new file mode 100644
index 00000000..9e355d1b
--- /dev/null
+++ b/GitForkTest.txt
@@ -0,0 +1,3 @@
+From my fork
+
+From my fork
diff --git a/HolaSoyAlfredo.txt b/HolaSoyAlfredo.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/Jhonny_Perez.txt b/Jhonny_Perez.txt
new file mode 100644
index 00000000..310e839a
--- /dev/null
+++ b/Jhonny_Perez.txt
@@ -0,0 +1 @@
+Hola, este es mi commit desde un fork. Saludos.
\ No newline at end of file
diff --git a/Mire.txt b/Mire.txt
new file mode 100644
index 00000000..2cf95b0e
--- /dev/null
+++ b/Mire.txt
@@ -0,0 +1,3 @@
+Probando
+Probando2
+Probando3
diff --git a/Prueba-khahory.txt b/Prueba-khahory.txt
new file mode 100644
index 00000000..717f912d
--- /dev/null
+++ b/Prueba-khahory.txt
@@ -0,0 +1 @@
+Mi txt
diff --git a/Prueba.txt b/Prueba.txt
index bcbeb51c..3d9a0eb1 100644
--- a/Prueba.txt
+++ b/Prueba.txt
@@ -8,3 +8,5 @@ prueba hm
04-11-2014 19:19 [operez] Añado linea para el segundo commit y completar el tutorial
06-11-2015 19:19 [operez] Añado linea para el segundo commit y completar el tutorial
09-11-2015 19:16 [carsava] Añado esta linea
+02-01-2018 18.53 [Ana.Grau] modificando el archivo
+Random Change
diff --git a/PruebaDeFork_Flor.txt b/PruebaDeFork_Flor.txt
new file mode 100644
index 00000000..62b36bf3
--- /dev/null
+++ b/PruebaDeFork_Flor.txt
@@ -0,0 +1,2 @@
+Prueba Fork
+Modificado!
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..1cd5555e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,16 @@
+# Pull Request Tutorial
+
+Comandos para trabajar con forks:
+
+
+git remote add upstream https://github.com/whoever/whatever.git (añadir al git remote el repositorio original)
+
+git fetch upstream (actualizar el fork)
+
+git checkout master (cambiar a la rama master)
+
+*Hacer cambios aquí*
+
+git rebase upstream/master (añadir commits)
+
+git push -f origin master (actualizar tu repositorio)
diff --git a/SoyJhonny.txt b/SoyJhonny.txt
new file mode 100644
index 00000000..8ff717ad
--- /dev/null
+++ b/SoyJhonny.txt
@@ -0,0 +1 @@
+Solo estoy pasando por aqui para dejar huella de mi existencia :v, soy jhonny perez xD
\ No newline at end of file
diff --git a/anroba.txt b/anroba.txt
index ee9b0cb7..9a70553d 100644
--- a/anroba.txt
+++ b/anroba.txt
@@ -2,3 +2,8 @@ prueba
prueba1
prueba2
prueba3
+pruea5
+este es mi aporte:
+-El destino de los hombres no está hecho de momentos felices,
+ toda la vida los tiene, sino de épocas felices.-Friedrich Nietzsche.
+ QUÉ ES HACER FORK A UN REPOSITORIO Y CÓMO HACER UN FORK CORRECTAMENTE
\ No newline at end of file
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 859e1457..48d4d73c 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -5,3 +5,5 @@ ilustrar qué es un Fork y cómo se mantiene actualizado.
Corrigiendo hotfix_15423
+
+Ejemplo post commit
\ No newline at end of file
diff --git a/asd.txt b/asd.txt
new file mode 100644
index 00000000..03573c52
--- /dev/null
+++ b/asd.txt
@@ -0,0 +1,3 @@
+Holitas :3
+
+Ajjaj xd lol
\ No newline at end of file
diff --git a/edwin b/edwin
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/edwin
@@ -0,0 +1 @@
+
diff --git a/edwin.txt b/edwin.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/gitman.txt b/gitman.txt
new file mode 100644
index 00000000..e1676bf9
--- /dev/null
+++ b/gitman.txt
@@ -0,0 +1,2 @@
+No se te exige que acabes el trabajo pero tampoco eres libre de abandonarlo...
+A veces es mejor no hablar...
diff --git a/goku4pancho.txt b/goku4pancho.txt
new file mode 100644
index 00000000..54016c2c
--- /dev/null
+++ b/goku4pancho.txt
@@ -0,0 +1,7 @@
+El usuario goku4pancho ha pasado por aqui para hacer un pull request muy sensual.
+
+Muchas gracias!
+
+Aprecio mucho tu ayuda, gracias de nuevo!!
+
+I want to break free!!
diff --git a/images/nomames.jpg b/images/nomames.jpg
new file mode 100644
index 00000000..c0807097
Binary files /dev/null and b/images/nomames.jpg differ
diff --git a/index.html b/index.html
new file mode 100644
index 00000000..1bc36b90
--- /dev/null
+++ b/index.html
@@ -0,0 +1,23 @@
+
+
+
+
+
+ Jhonny dice hola
+
+
+
+ Hola soy Jhonny
+ Mi Facebook
+
+
\ No newline at end of file
diff --git a/key b/key
new file mode 100644
index 00000000..ca6b082e
--- /dev/null
+++ b/key
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,56131421F7C9E5BD47EE0A8A107BBF40
+
+QLi249oVKr0+VpglvIRU/Ah6Q3h22UQxeQP7GdI/z9YWsjRjCbojEJ/j3KTyEwG0
+FIN+kkfhDqd5EyWmmTC90QvmoQzS3/mxOJm0vhNnvtMbW+ReYv3C8+8ZbK7gCBQj
+uZFkzZgzlzmmpx0mJAct7eRUZ0wiO7LWN4yXU+Jcrpj75kz/kMrBWhOLCrX8ZHKY
+djoYPS3j0i0jo5Ffur0+/5Co8JkrzQ61TYLCF+Nbs77wRfqM4SIlqL9xmnnHf+KX
+WLuVh7jUq3Gw6kaXNvX+l5xfBL0KjNzB7jADatkRGTM3oO9cGp5NA1XMFZz+m8Oc
+0LTB8sgKAzYcaUd7gVLJ/nZAUvjWsyFofD1tStfwauh2HoouZbw74aOpSv3+KwG8
+yCAPwx7okuR/Y+mgbReCjqKevpmlDU6R5YQF0EKn1HYOaOwhU4VTbUY1fGu5Wiu+
+QXtQUrWCZ7Ph9OsAIS3XUkDJyKDlCNNvGDPsq3QY0Qk2c+pRUk/4NcaoGsxG0axq
+z7bIuD2+buU/E+lLlbA8ykblCWVEec7fKjvVQxPZvJXck0nHJj+XcYPktwQ3AVa1
+9amIKtv1bVFc7E4l7P7anEMlk9rUkySgW1ZV70G+blctMspVMMlug6zrdQJMznTD
+0Ytts+H2waOjeSaBIuKEsgzBJAIw91OmDpRHT5MZ/HNwqIQ+iQiGdAdzGfTdixf3
+eECfzwCXzwXEGzO8Yjq48AWDwbDfbVTLo+vZW6jt5unRLezvQcCuRckASs7lrr6n
+7E+OVWZvo+7ci214grMdCNDF1ihFWobuMT/H1gfvEPUWxKGGWsOrSC9j7Ow3pOMA
+Teo1N9znhUpujeo3kQ4J879yZKEuY3fPuR0Dgay9sugvLEbmOdgZlINyqmDHpg7Q
+0MWpZ5HUQeF7ycEUEfOcKjjLk8uf/mLKiy2rdzKcuagk+al1xJpIL6r57TzJynmb
+GoIbAAbTQgBRvRG4knbISwsNJzoWweS6Fx2OfuPcxZjR85+dvNUdwsqlU7w14H3o
+HfMGdW8EgKfuRORAPPjpQX+1vYOLePjGgg93XfZjfjdWRAmuAMcRPDdmFu7QBL87
+fjR3DTLT0QdbbbHEif445ygeJcGUCiK2MVgXQtEafMBeNr8r03McCSjiGXW2DIc+
+7hRUgzm7E78Db4lmDQl661YAdWs5g46NymEU7P3MA4Gjw7aarx0xZom9JFX7K09B
+0xVTrTxSJtzwNoeSSchm0YY4dTL2h4+kIHifJtc1/2l09UTyc56B5t21iqDjWKna
+MIV2T8T8h6B4/wUfSFzQjk7znxt/fif6Qigt/mmbyFxXs2jTCIzcu96UxKlQ2Ayy
+TMopyPZ4SXBEY38W/tHYtApgdLQG0Dese7hExH5SSzShqZkyzs/tmcjOMIoRBCQn
+ZrnPM6sdnpAu56JYAZalEm1+RF27o9GfzjmBNoZ5InpdU1oRIwWqg6VRJGTiUxlW
+4OOPhbZ6qEfxND3ZN7psMLBEffOICXa0KSAl5x+zEpWalUeCe3wpXy1ua/hUpVRt
+SKoL/SU2SW3pYPHRwc6in9Q+9lT2XJtOJAnJbYVknZ/7C6CpAMii1CczBFVliDBa
+-----END RSA PRIVATE KEY-----
diff --git a/key.pub b/key.pub
new file mode 100644
index 00000000..ec405d2c
--- /dev/null
+++ b/key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5500UjDWhqkPRGc7aAFN/O4lGOXyXzJtivhTNpW7WNL5d6Ys8zZn6x6w4X+bLehRTQX71qh8HRQCqwomhXuv2Ck9UKozZaJlnrbzz6WG/z8bINfTax1fbwFgOKpZZAPhMG85SstWKrtc2gdA4CHc1y6Fj83GRZnWvsg3eNmGtq6dpnoKdZAmATgvldcJqLrxUdj9mK3Jz29C4tJ4owB/0176vX8Kq8C+q3byWEvsngIwCFTKuXoeHbXSmzDYzKaAYoSoCmwWx1X6OMchCxoBBRlD/0mQt3e4BiuWR7ILMalnR3Zzt+HyThuDUIjrTK2SpSUHPnEhm05hVn5J/YRj/ edwinfrc@hotmail.com
diff --git a/my_fork.txt b/my_fork.txt
new file mode 100644
index 00000000..f45829ca
--- /dev/null
+++ b/my_fork.txt
@@ -0,0 +1,5 @@
+Prueba de fork aresof
+cambio1
+cambio2
+
+Cambio3
\ No newline at end of file
diff --git a/patosaid.md b/patosaid.md
new file mode 100644
index 00000000..865c0c0c
--- /dev/null
+++ b/patosaid.md
@@ -0,0 +1,5 @@
+# Hola!
+
+*Intento de hacer pull request*
+
+*Intento numero 2*
\ No newline at end of file
diff --git a/pruebafork.txt b/pruebafork.txt
index 69b835fe..54faec05 100644
--- a/pruebafork.txt
+++ b/pruebafork.txt
@@ -1,2 +1,3 @@
PRUEBA 2
prueba malvarez
+Anadiendo una linea extra [Ana.Grau]
diff --git a/public/index.orig.html b/public/index.orig.html
index a1d50995..3d0a5f61 100644
--- a/public/index.orig.html
+++ b/public/index.orig.html
@@ -190,7 +190,7 @@