.
Merge branch 'master' of github.com:Ji-Yuhang/dict-gui

Conflicts:
	mainwindow.cpp