added Hi
fixed the conflict.
Merge branch 'master' of https://github.com/eligijus/test2-master

Conflicts:
	test.file