Delete the old dictionary folder
解决冲突
Merge branch 'Code' of https://github.com/FDSE/WordMaster into Code

Conflicts:
	dictionary/src/word_master/Helloframe.java
	dictionary/src/word_master/ProcessModel.java