new line in coolfile.txt
new line in story1
Merge pull request #5 from conorgriffin/feature

Feature