mas y mas cambios xD
Merge branch 'master' of https://github.com/cataOrtiz/obs