Lo de los filtros
Merge branch 'master' of https://github.com/jenniferdr/humanoide

Conflicts:
	Libro/libro/marco_teorico/3_Vision_Artificial.tex