committed text to master branch
Merge branch 'master' of github.com:pbodsk/testrepo

Conflicts:
	hello.txt