Adding to master while there's a branch out there.
Merge commit '8f18fc4abf764e8006831028dfc367359b90740d' into TestBranch

* commit '8f18fc4abf764e8006831028dfc367359b90740d':
  Adding to master while there's a branch out there.

Conflicts:
	test.txt