Entorno de trabajo
Merge branch 'Lopez_Garcia' of https://github.com/lorgut/EvolSoft into RamaCarlosLopez
Merge branches 'Lopez_Garcia' and 'RamaCarlosLopez' into Lopez_Garcia
READMELopez_Garcia deleted
Merge branch 'master' of https://github.com/lorgut/EvolSoft
Revert "mas arreglos"

This reverts commit 1657c28cfbf0e6df22884e9412df4c139ff7ce12.
Merge https://github.com/lorgut/EvolSoft into Lopez_Garcia

739657db0a544b9a6da274.

Conflicts:

	pb.c
Revert "My_sort_func"

This reverts commit c99fb99fee8726c800b0c745132dc5a4d9360794.

Conflicts:

	pb.c
Merge branch 'Lopez_Garcia' of https://github.com/lorgut/EvolSoft into Lopez_Garcia
Merge branches 'Lopez_Garcia' and 'RamaCarlosLopez' into Lopez_Garcia