fixed merge conflict that corrupted last copy
Merge branch 'master' of https://github.com/michaelmunson1/caracol