Change in ActionTest.java
Merge branch 'master' of https://github.com/lemonleavesE/WordMaster

Conflicts:
	user.conf
user.conf没变啊，但是git一定要commit
Merge remote-tracking branch 'choose_remote_name/master'
NULL
王立你把actiontest.java跑一下，缺少的测试我都写在注释里，config文件你帮我写一个吧，我还是看不懂。。
对整个项目进行重构，同时改动了configure文件的读写顺序
Action的接口全部定义完全
ReadME.md是对整个项目的完整描述
由于重构，所有将重构过程中发生改变的代码合并一下
Merge branch 'master' of https://github.com/lemonleavesE/WordMaster

Conflicts:
	user.conf
Merge branch 'master' of https://github.com/lemonleavesE/WordMaster

Conflicts:
	src/controller/EventHandler.java
	src/model/bean/Word.java
	src/viewer/WordMasterUI.fxml