New stuff 2
Merge branch 'master' of https://github.com/PerryCampbell/GitFun

Conflicts:
	New Text Document.txt