Signed-off-by: John Alberto Carreño Lizcano <inglizcano@gmail.com>
Signed-off-by: John Alberto Carreño Lizcano <inglizcano@gmail.com>
Merge branch 'master' of git@github.com:johnalberto/pruebasgp.git

Conflicts:
	prueba.txt

Signed-off-by: johnalberto <inglizcano@gmail.com>