my owl poem
Added a new file
Modify story1 file
new line in coolfile.txt
new line in story1
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!
New files
Merge git://github.com/jholleran/tcube-jan2014
Merge branch 'jh-feature' of https://github.com/jholleran/tcube-jan2014 into jholleran-jh-feature

Conflicts:
	sample1.txt
	story1.txt