This is fourth commit.
This is 6th commit for resolving merge conflict.

Merge branch 'b1'

Conflicts:
	README.txt