Branched commit to test

Branched commit to test
Merge branch 'sidebranch'

Conflicts:
	test.txt
Sidebranch commit 2

Sidebranch commit 2
Merge branch 'sidebranch'