my owl poem
new line in coolfile.txt
new line in story1
new changes!
ronan test
added to my new branch
Merge pull request #5 from conorgriffin/feature

Feature
Merge pull request #2 from lornajane/stuff

my owl poem
Merge pull request #3 from rmcmahon/mystuff

Mystuff
Merge pull request #9 from kdarker/master

new changes!
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014