fix merge conflicts
Merge pull request #94 from kyledaugherty/style

fix merge conflicts