Merge branch 'stream'
Merge branch 'stream'
Merge branch 'stream'
fixed some documentation.
Merge branch 'userinterface'
Merge branch 'master' into analyzer
Added a function for merging the two streams. Has some error
Merge branch 'analyzer'
.gitignore update
Project rebuild and cleanup.
ResearchProgram/out folder added.
Merge branch 'master' into launcher
Fixing the exiting functions
FaceTracker class created.  Analyzer.recombineVideo() changed to return only face image for testing purposes.
CAMshift algorithm implemented in FaceTracker class.  Each instance of FaceTracker meant to track a single instance of Face.
Facetracker sort of working.  Need to determine how to properly transform JavaCV IPLImage to OpenCV mat or rework FaceTracker to use JavaCV methods and objects exclusively.
Refactoring facetracker to use javacv methods and objects.
ObjectTracker class first draft complete.  Functionality not tested.
Object tracking functional but performing poorly.
A single face can successfully be tracked even if face detector fails to find face in frame.