-- from eclipse
Merge branch 'master' of https://github.com/vivekchaudhari/HelloGit.git
-- trying to solve conflicts
Conflicts:
	sample.txt