detalles de cappeletto
merge
Merge branch 'master' of https://github.com/jenniferdr/humanoide

Conflicts:
	Libro/libro/desarrollo/1_diseno.tex