luochen add network package
first commit in newBranch
second commit in newBranch
third commit in newBranch
first commit in master
Merge branch 'newBranch' with server

Conflicts:
	test
luochen add network