null merged in new review
[fix] conflicts

Merge branch 'master' of github.com:archetipo/leapmouse

Conflicts:
	Leapmouse.cpp