Rapport de caméras
Merge branch 'master' of https://github.com/Evarin/cctvTracker

Conflicts:
	main.py
	mapsDisplayer.py