logs
Merge branch 'master' of https://github.com/johannesE/multimodal_interfaces

Conflicts:
	SuperBall/SuperBall/Debug/CL.read.1.tlog
	SuperBall/SuperBall/Debug/SuperBall.log