Version final
Merge branch 'master' of https://github.com/balamrod/seminario