ready to goto ubuntu
Merge branch 'master' into test2

Conflicts:
	config.txt.example
	multiTrackAssociation.cpp
	parameter.h
	tracker.cpp
	tracker.h
.
this tracker seems to be nice
Merge branch 'test2' of https://github.com/Th0ar/people-tracker into test2

Conflicts:
	multiTrackAssociation.cpp
	tracker.cpp
add makefile
Merge branch 'test2' of https://github.com/Th0ar/people-tracker into test2