Tilde
FIxade(?) trackObject
Merge branch 'Martin'
Japp
Get Snapshot
tilde….
Merge branch 'master' of https://github.com/SLahti/Matlabproject
bytte plats på stycken
Merge branch 'Sebastian'
Merge branch 'master' of https://github.com/SLahti/Matlabproject
Merge branch 'Sebastian'
Uppdaterade highligtObject och småsaker i trycker
Merge branch 'Martin_140513'

Conflicts:
	tracker.m
Allt funkar farm till trackTarget

~sant
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'