fixing post-merge
Merge branch 'master' of github.com:encorelab/CommonKnowledge