less couts
Indicator
Merge branch 'new2' of github.com:carolanitz/VideoPanorama into new2

Conflicts:
	matcher/matcher.cpp
Merge branch 'new2'