issue01 commit:wq
remove test.txt
issue02
Merge branch 'master' into issue02

Conflicts:
	test.txt
fix01
master
Merge branch 'fix01'

Conflicts:
	test.txt