Update hello.txt
Merge branch 'master' into feature/devsubbranch

Conflicts:
	hello.txt (resolved)