added another library
Merge branch 'master' of https://github.com/johndoherty/pistol_detection

Conflicts:
	PistolDetection/main.cpp
added smaller logo
Merge branch 'master' of https://github.com/johndoherty/pistol_detection

Conflicts:
	PistolDetection/main.cpp
modified project