mama
Merge branch 'master' of https://github.com/jenniferdr/humanoide

Conflicts:
	Libro/libro/intro/intro.tex
Merge branch 'master' of https://github.com/jenniferdr/humanoide
mama