Merge branch 'ganesh-branch' of https://github.com/coreyshaffer/sample-git-workflow into bsur-branch

Conflicts:
	test-folder/sample2.txt