add new line

Add new line locally to bring on conflict with remote
Merge branch 'master' of https://github.com/mariasemerdjieva/Hello-World

Conflicts:
	test.txt