G commit

this is a commit from g
Merge branch 'ganesh-branch' of https://github.com/coreyshaffer/sample-git-workflow into bsur-branch

Conflicts:
	test-folder/sample2.txt
Merge branch 'master' into ganesh-branch

Conflicts:
	test-folder/sample-234.txt
Merge branch 'master' into ganesh-branch

Conflicts:
	test-folder/sample-234.txt
Merge pull request #9 from coreyshaffer/ganesh-branch

G commit