Merge pull request #14 from rockamorales/master

Mas modificaciones
Linea XD
Merge pull request #114 from schumy21/master

sin modificaciones schumy
Merge pull request #113 from mackk/master

merge
Merge pull request #15 from rockamorales/master

Merge
Merge pull request #115 from mackk/master

done
Merge pull request #13 from rockamorales/master

Merge all