arreglando vairas partes
Merge branch 'master' of https://github.com/Oscarsgc/ResSis
bugs fixeados