hopefully didn't wreck anything
Merge branch 'master' of https://github.com/alecmeade/leapMotion