Cambios en osgiliath.tex
Merge branch 'master' of https://github.com/fergunet/tesis