Merge branch 'version3.0' into ArielQian
Merge branch 'version3.0' into ArielQian
Stable Version

Finish all the comments and no bugs
Merge branch 'ArielQian' into version3.0
Merge branch 'version3.0' of https://github.com/FudanSoftwareCCWI/Lab4 into version3.0

Conflicts:
	src/wm/model/Dictionary.java
	src/wm/test/model/DictionaryImplTest.java

conflict solved
Merge branch 'version3.0' of https://github.com/FudanSoftwareCCWI/Lab4 into version3.0

Conflicts:
	src/wm/model/Dictionary.java
	src/wm/test/model/DictionaryImplTest.java
conflict solved