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

Conflicts:
	lookin-0_0_1/render/rendergraph.cpp
Merge branch 'master' of https://github.com/tohu/lookin

Conflicts:
	lookin-0_0_1/Lookin.cpp
Merge branch 'master' of https://github.com/tohu/lookin
timer
Merge branch 'master' of https://github.com/tohu/lookin

Conflicts:
	lookin-0_0_1/timer.cpp
	lookin-0_0_1/timer.h
Merge branch 'master' of https://github.com/tohu/lookin

Conflicts:
	lookin-0_0_1/timer.h
Merge branch 'master' of https://github.com/tohu/lookin