finalizing first draft of kinect code
fixing weird merge error