Merge pull request #16 from SeGonzalezR/armagedon

Armagedon
Merge pull request #17 from SeGonzalezR/armagedon

Armagedon
SQL
Traduccion metodos de envio