test by aiman
Merge branch 'master' of https://github.com/marktwinkle/G53SQM.git

Conflicts:
	DataBase/src/Client.java