second line
Merge branch 'master' of https://github.com/thushara463/gitdemo

Conflicts:
	HelloGit.java