brance slave: fileb
brance master fileb
Merge branch 'slave'

Conflicts:
	fileb