branch 2
Merge branch 'branch2' into branch1

Conflicts:
	.project
	README.md