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

Conflicts:
	lookin-0_0_1/NodePositioner.cpp
	lookin-0_0_1/Presentation.cpp
ups