para detectar
Merge branch 'master' of https://github.com/jenniferdr/humanoide
merge
Conflicts:
	OpenCv/detectar.cpp