Ryan Commit: added facerecognizer
11/13
11/16
Merge branch 'master' of https://github.com/dcslack/compviz

Conflicts:
	detect_and_track
	detect_and_track.cpp