.
Merge branch 'branch0'

Conflicts:
	test0.txt
Merge branch 'master' into branch0

Conflicts:
	test0.txt