Versiones mezclás. Mi parte da error a veces.
Merge branch 'master' of https://github.com/sergiofrrg/VisionArtificial

Conflicts:
	Practica3VA/Practica3VA
	Practica3VA/Practica3VA.pro.user
	Practica3VA/main.cpp
	Practica3VA/main.o