integrar commits
Merge branch 'master' of https://github.com/mateogo/sgca

 recuperacion de git