Fix translator and combine

[Miguel]

The translator in this one

Desaf�os de programaci�n: El manual de entrenamiento para concursos de programaci�n

is me

Miguel Revilla Rodríguez

but as the characters are all messed, it shows like a different one. Also, the book is another edition of

Desafíos de programación: El manual de entrenamiento para concursos de programación

and both are the Spanish version of

Programming Challenges: The Programming Contest Training Manual

so they should be combined.

Thanks!