1
Merge branch 'dev' of github.com:Java3-2/Card-English into dev
merge
Merge branch 'dev' of github.com:Java3-2/Card-English into dev
登录完成
Conflicts:
	CardEnglish/src/com/Mars/domain/IService/IWordService.java
	CardEnglish/src/com/Mars/domain/Service/WordService.java