init
Merge branch 'master' of https://github.com/zangxiaoqiang/DFC.git

Conflicts:
	src/main/java/com/github/dfc/server/Server.java