final version

合并view模块；修复两个bug - 1. 提示单词不在本词库内 2.匹配不正确
this is the final version

sorry about the last one
Merge remote-tracking branch 'origin/controller_branch'

Conflicts:
	src/controller/FirstWordSettingController.java
	src/controller/test/TestFirstWordSettingController.java
	src/controller/test/TestNumSettingController.java
Commit
Commit TestCase

每次我同步的时候都会出现问题诶，，，刚才的同步又出现conflict了