Geom
Merge branch 'master' of github.com:VicdeJuan/Apuntes

Conflicts:
	Geometria de Curvas y superficies/tex/ejercicios.tex