another useless commit
Merge branch 'master' of github.com:sdc-mjo/git-examples

Conflicts:
	helloWorld.txt