New beginning
Merge branch 'master' of github.com:debsankha/learn_git

Conflicts:
	sample.txt