commit master mode
testing changed
Merge branch 'testing'

Conflicts:
	doc1.txt
commit master_1
testing init
testing changed
master init
master changed
testing change
testing init
Merge branch 'testing'
commit 01
commit02
conflict fix
commit 03
commit 04
rebase 01
rebase 02
rebase testing changed
rebase master changed