added input handler and stuff to capture
Merge branch 'master' of https://github.com/bstroosnijder/KB06

Conflicts:
	src/Program.cpp
Fixed up the Program.cpp