new branch and new file added
added header
More editing
just some text
Merge branch 'testbranch2-branch' into testbranch2
Merge branch 'testbranch2' into testbranch

Conflicts:
	test.md