started kinect optical flow project
a
fixed manifest merge
Merge branch 'master' of https://github.com/Russell91/USCAerialRobotics