stuff! :D
Merge branch 'master' of https://github.com/bstroosnijder/KB06

Conflicts:
	src/Game/Playground.cpp
Merge branch 'master' of https://github.com/bstroosnijder/KB06
Merge branch 'master' of https://github.com/bstroosnijder/KB06

Conflicts:
	src/Game/Playground.cpp
point detector update
Merge branch 'master' of https://github.com/bstroosnijder/KB06
more awesome stuff
Merge branch 'master' of https://github.com/bstroosnijder/KB06