little debug
Merge branch 'master' of https://github.com/markselby9/Lab4Word

Conflicts:
	record/record.dat
	src/controller/WordController.java
	src/view/Data_all.java
	src/view/Data_small.java
	src/view/MainView.java
	src/view/SelectWordFrame.java