controls moved
Merge remote-tracking branch 'origin/generalising' into generalising

Conflicts:
	meltdown.py