Merge branch 'master' of https://github.com/ConyV/Caldillo

Conflicts:
Tarea 6/T6/T6.log
Tarea 6/T6/T6.pdf
Tarea 6/T6/T6.synctex.gz
nie
Merge branch 'master' of https://github.com/ConyV/Caldillo