query
controller
hjk
Merge branch 'master' of https://github.com/lelelelemon/WordMaster.git
a
Merge branch 'master' of https://github.com/lelelelemon/WordMaster

Conflicts:
	META-INF/MANIFEST.MF
	src/GUI/Query/QueryPage.java