added to story
merged
Merge pull request #1 from jllord/master

Story Contribution
Actually fix merge conflicts