added demo images and testing code
Merge branch 'master' of https://github.com/johndoherty/pistol_detection

Conflicts:
	PistolDetection.xcodeproj/project.pbxproj
	PistolDetection/chamfer.cpp
	PistolDetection/chamfer.h
	PistolDetection/main.cpp
cleaned up stuff
Merge branch 'master' of https://github.com/johndoherty/pistol_detection
added image splitting