Real changes
Merge branch 'master' of github.com:ambivalentduck/psychicRobot

Conflicts:
	displaywidget.h