fixes merge conflicts again
Merge pull request #52 from JBrianGordon/jamesbranch

fixes merge conflicts again