This is another test
Merge pull request #17 from coreyshaffer/bug-q

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

Conflicts:
	test-folder/sample-234.txt