Changes for UC computer
Merge branch 'master' of https://github.com/shanqing-cai/commonmcode

Conflicts:
	cds.m