Yeah branch update
Merge branch 'branch1'

Conflicts:
	doc.txt