Merge pull request #133 from mackk/master

mod
Merge pull request #134 from schumy21/master

schumy22
Merge pull request #28 from schumy21/master

Modificaciones
Linea XD
Merge pull request #135 from mackk/master

mod
Merge pull request #26 from rockamorales/master

Modificaciones