Is this on a separate branch?
Merge branch '2ndCBranch'

* 2ndCBranch:
  Is this on a separate branch?

Conflicts:
	testFile
Merge branch 'master' of github.com:JasonBates/gitTest

* 'master' of github.com:JasonBates/gitTest:
  Create README.md