first branch
branch 2
branch 2.1
master
Merge branch 'branch_2'

Conflicts:
	README.md