John is added to Hello.txt.
Merge branch 'master' of https://github.com/mftv/freetest0

Conflicts:
	src/hello.txt