awdavies/ZenBox — pull request #10 by brucec5 (2013-03-11 01:36:31+00:00)
Title: Optical flow merger

Merge in Andrew's Optical Flow code with the rest of the code.