test & de file
modify main.cpp
Merge branch 'master' of https://github.com/jiangmingfu/test