nix
Merge branch 'master' of https://github.com/tohu/lookin.git

Conflicts:
	lookin-0.0/LeapListener.cpp
	lookin-0.0/Presentation.cpp