first change from dev 1
Merge branch 'develop' of https://github.com/tom-mtdo/hello-word into develop

Conflicts:
	third-file-develop-branch.txt

changed conflict