third commit
Merge branch 'master' of https://github.com/pbd84/myRep

Conflicts:
	HelloWorld.txt