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

fixed conflicts