commito
Merge branch 'master' of https://github.com/sergiofrrg/VisionArtificial

Conflicts:
	Practica3VA/Practica3VA.pro.user
He quitado los espacios del main