improved matching
re-ran test
Merge branch 'master' of https://github.com/johndoherty/pistol_detection

Conflicts:
	PistolDetection/main.cpp
cleaned up stuff for commit
cleaned up directory