edit newB
Merge branch 'newB'

Conflicts:
	hello.txt