同步服务器文件
Signed-off-by: leohainuo <admin@hainuo.info>
恢复 被错误覆盖的两个文件
Signed-off-by: herio <hainuo@foxmail.com>
Merge branch 'master' of https://coding.net/hainuo/huatutu
  增加 新文件
Conflicts:
	images/kaoshi-icon1.jpg