Added geometry to the main tex
Merge branch 'master' into lluis