merge and heatpmap
Merge branch 'master' of https://github.com/Th0ar/people-tracker

Conflicts:
	.gitignore
	Makefile
	multiTrackAssociation.cpp