Finished Story 1
Merge pull request #10 from peter-tackage/story1

Finished Story 1