Merge branch 'master' of https://github.com/MatJim-Ottawa/CollocInfer

Conflicts:
	ChemoStatDemo.m