Merge pull request #128 from schumy21/master

Schumy17ABR AM
Merge pull request #22 from rockamorales/master

Mas modificaciones
Merge pull request #129 from mackk/master

reportes
Merge pull request #21 from rockamorales/master

Modificaciones