3人讨论后的提交
Merge branch 'master' of https://github.com/zengluyang/wsn_contest_doc