Harris debugged

Harris debagged (hopefully).
Non-maximum suppression

New non local maximum suppression algrorithm. Now in util.cpp