ashley's first fork branch commit
ashley's second commit
Added a new file
try a ne wcommit
Modify story1 file
test test test
my change
Merge remote-tracking branch 'upstream/master' into new
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014 into new
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014
hey there
Pat update
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014
Merge branch 'ashleys_fork' of https://github.com/Ashley-Waldron/tcube-jan2014 into Ashley-Waldron-ashleys_fork

Conflicts:
	coolfile.txt
Merge pull request #12 from paulhitz/master

ghjghjghjgh
Added conors-file.txt
commit 2
Merge pull request #11 from billblake/master

test
Secret documents