Changed Hello to Hola
Merge branch 'master' of https://github.com/fmccown/TestRepo

Conflicts:
	hello.txt