Slave first commit
Slave update
New file
Merge branch 'slave'