b3
Merge branch 'b3'

Conflicts:
	hello.txt