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

Conflicts:
	lookin-0_0_1/FilesystemGraph.cpp
	lookin-0_0_1/Lookin.cpp
	lookin-0_0_1/lookin-0_0_1.pro.user