resolved merge conflict.  Removed unnecessary debug log statements
Merge branch 'master' of https://github.com/TheEpigoni/KinectZilla