Merge pull request #20 from kcrabtree1225/kc-change-mechanics

fixed conflicts
Merge branch 'master' of https://github.com/kcrabtree1225/jezabel into kc-change-mechanics