slave1 first commit
Merge branch 'slave1'

Conflicts:
	file1.c