第一个，忘提交
.classpath冲突
提交
Merge remote-tracking branch 'origin/master'

Conflicts:
	WangTest/.classpath
Merge branch 'master' of https://github.com/wangjingbomail/wangtest

Conflicts:
	WangTest/.gitignore
commit