puto commit
Merge branch 'master' of https://github.com/chrisan1992/Proyecta