branch first commit
Merge branch 'master' of https://github.com/maruxyz/tutorial into branch1

Conflicts:
	sample2.rtf
this commit is after merge
branch4 first commit
branch3 first commit
Merge branch 'branch4' into branch3

Conflicts:
	sample.rtf
Merge branch 'branch4'