test conflicts
Merge branch 'master' of github.com:wangjian2014/wjtest
Conflicts:wj.txt