I have committeed
Trying to cause a conflict
Why, I am trying to cause a conflict as well.
Merge branch 'yourBranch' of https://github.com/jbrownkramer/testRepo into yourBranch

Conflicts:
	hiThere
spdofksdsdfpok
Also seeing if it pulls multiple branches.
Update test
gfdghjghj
CHanged test
Ha ha
Merged
Merged