test conflicts
Merge branches 'master' and 'master' of github.com:wangjian2014/wjtest

Conflicts:wj.txt 3