patch7
Confilics resolved.
Merge branch 'patch1'

Conflicts:
	hi.txt