fixed diff
Merge branch 'master' of github.com:sgess/LiTrackOptimized