update core.clj
Merge branch 'master' of github.com:dongshu-factual/shu-cascalog

Conflicts:
	src/shu_cascalog/core.clj