create local branch br1
Merge branch 'master' of git://github.com/in4king/testgithub
add new_master_file
add c5 file in master branch
add c6 file in master branch
add c8 files in client branch
add c9 file in client branch
add c3 file in server branch
add c4 file in server branch
add c10 file in server branch
rebase test