Configuracion

configuracion
Merge branch 'master' of https://github.com/mimisi/MaestriaPW