funciones
Merge branch 'master' of github.com:mbarraco/tesis