ti jiao lo
changde adfsadf
add 1.c
master w
add write 2.c
slave w
Merge branch 'slave'

Conflicts:
	2.c
create 1,2.c and write