my owl poem
PaulOn's change
Pat added a file.
new line in coolfile.txt
Pauls Change
new line in story1
new changes!
Pat added a second file.
ronan test
Merge branch 'master' into PaulOnBranch

Conflicts:
	coolfile.txt
added to my new branch
Merge pull request #1 from poneill00/PaulOnBranch

Paul on branch
Merge pull request #6 from pmcb55/PatBranch

Pat's branch
Merge remote-tracking branch 'upstream/master' into new
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 into new