Change
Merge branch 'master' of https://github.com/tzahgr/test

Conflicts:
	Hello.txt