new line entered
Merge branch 'master' of https://github.com/rajfaujdar/demo1

Conflicts:
	hello.txt
Merge branch 'master' of https://github.com/rajfaujdar/demo1

Conflicts:
	hello.txt