striche, from to
WRONG
Merge branch 'master' of https://github.com/tohu/lookin

Conflicts:
	lookin-0_0_1/Lookin.cpp