Merge https://github.com/lorgut/EvolSoft into RamaCarlosLopez
Revert "My_sort_func"

This reverts commit c99fb99fee8726c800b0c745132dc5a4d9360794.

Conflicts:

	pb.c
Revert "My_sort_func"

This reverts commit c99fb99fee8726c800b0c745132dc5a4d9360794.

Conflicts:

	pb.c
Revert "My_sort_func"

This reverts commit c99fb99fee8726c800b0c745132dc5a4d9360794.

Conflicts:

	pb.c
ASDA
Merge branches 'Lopez_Garcia' and 'RamaCarlosLopez' into Lopez_Garcia