Segundo commit, HelloWorld
Merge branch 'master' of https://github.com/SeanBurger72/gitTest

Conflicts:
	HelloWorld.txt