MatchingTemplate
merge
merge variable
Merge branch 'master' of https://github.com/Sarreth/IN52

Conflicts:
	dev/vehicule_detection/main.cpp
	dev/vehicule_detection/vehicule_detection.pro