PaulOn's change
Pauls Change
Merge branch 'master' into PaulOnBranch

Conflicts:
	coolfile.txt
Merge pull request #1 from poneill00/PaulOnBranch

Paul on branch