Eliminé una linea
Merge branch 'master' of https://github.com/halonsov/pki
Muchos errores
Resuelvo merge