intermediate
Merge branch 'master' of github.com:bnoi/scikit-tracker

Conflicts:
	sktracker/trajectories/trajectories.py
Gap close attempts
Merge branch 'master' of github.com:bnoi/scikit-tracker
Fix test