branch3
Merge Again.
Merge branch 'branch3'

Conflicts:
	hi.txt