Add a line from hello2.
Merge branch 'master' of github.com:5amfung/hello

Conflicts:
	hello.txt