Commit probando
Merge branch 'master' of https://github.com/xyiyox/thesis
quitando commits feos