find how small a slice has to be to fail
got through half the hallway!
Merge branch 'other_branch'
Merge branch 'master' of https://github.com/izewiske/3Hat

Conflicts:
	OpenSURF/src/surf.cpp
	src/UtilityFunctions.h