added 2nd line
Merge branch 'master' of https://github.com/erolunal/test

Conflicts:
	hello.txt