Michael's change
Merge remote-tracking branch 'origin/feature/hello' into feature/hello

Conflicts:
	hello.txt