This is nice :-)
Merge branch 'bug-w' of https://github.com/coreyshaffer/sample-git-workflow into bug-q

Conflicts:
	test-folder/sample-234.txt
Merge pull request #18 from coreyshaffer/bug-w

This is nice :-)