modified:   objectsio.py
Merge branch 'master' of github.com:bnoi/scikit-tracker

Conflicts:
	sktracker/io/objectsio.py
Merge branch 'master' of github.com:bnoi/scikit-tracker