com2
Merge branch 'branch2'

OK
Conflicts:
	README