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
PaulOn's change
Pat added a file.
Pauls Change
Pat added a second file.
Merge branch 'master' into PaulOnBranch

Conflicts:
	coolfile.txt
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'
fix notes