Merge branch 'master' into Martin
Moved the trackObject into tracker

Put the functionality of objectTracker into the callback of trackObject
in tracker.
tilde
Merge branch 'Martin'
Meckat med trackObject i tracker.m

Tracker funkar!!!
Kommenterat i tracker.m
Merge branch 'Martin'