Not even sure what I changed, but the C++ changes were probably wise.
Merge branch 'master' of github.com:ambivalentduck/psychicRobot

Conflicts:
	Data/input.dat
	controlwidget.cpp