wtf
added training notes file
Ading files to d
commit new file on feature branch
Merge branch 'feature'
conflict commit
master commit for real
Merge branch 'conflict'
iand my stuff
Conflicts:
	featureFile.txt
update notes
ashley's first fork branch commit
ashley's second commit
Added a new file
Modify story1 file
my change
Merge remote-tracking branch 'upstream/master'
fix notes
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014
Pat update
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014