going to have conflicts
Merge branch 'master' of https://github.com/chuck1/jess
adding functionality