xxx
xxx

Merge branch 'master' of github.com:jlaake/marked

Conflicts:
	marked/R/probitCJS.R
	marked/R/proc.form.r