merge merge merge
Merge branch 'protocolo' of https://github.com/franaisa/Gloom into protocolo
ya no explota cuando mueres