edit in testbranch
Update test.md
more edits
just some text
Merge pull request #1 from remcovz/testbranch2-branch

Testbranch2 branch
Merge branch 'testbranch2-branch' into testbranch2
Merge branch 'testbranch2' into testbranch

Conflicts:
	test.md
Merge branch 'testbranch'

Conflicts:
	test.md
Merge pull request #4 from remcovz/master

test