Adding feature 1
Merge pull request #2 from chrisdaudier/story-2

Adding feature 1