cns
Merge branch 'master' of https://github.com/alexeyche/alexeyche-junk

Conflicts:
	cns/R/srm/cprog/.Rhistory
	cns/R/srm/cprog/gen_ucr_data.R