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
Merge remote-tracking branch 'upstream/master'
fix notes
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014