Working on branch2.
Done by leo
Merge branch 'branch2'

Conflicts:
	hi.txt