Fixed errors
Merge branch 'master' of https://github.com/mmaa94/Tarea6