Merge branch 'master' of https://github.com/epnev/continuous_time_ca_sampler

Conflicts:
	cont_ca_sampler.m
minor bug