Merge branch 'master' of https://github.com/CingHu/code

Conflicts:
	confnet/centos.c

all function develop finished