fixed merge conflict
Merge pull request #15 from jared-schmidt/mergeFix

fixed merge conflict