query engine update
Merge branch 'master' of https://github.com/gooftroop/CS6310P3.git
update to queryengine andquerywidget
testclientaccess commit
Merge branch 'master' of https://github.com/gooftroop/CS6310P3.git

Conflicts:
	src/tests/TestClientAccess.java