Merge pull request #20 from wigtor/master

Arreglos de errores php
cambio amasterController
Merge pull request #38 from dquinteros/master

copiando desde G4 a G1