test deal conflicts
Merge branch 'master' of github.com:wangjian2014/wjtest

Conflicts:wj.txt
 test