Todo madafakas

Añado Lo programado
Merge branch 'master' of https://github.com/tripir9/repo_uva