Vuelta al tronco
Merge branch 'rama1' of https://github.com/dml92/Pract3 into rama1

Conflicts:
	src/detector_coches.cpp