Test change type
Merge branch 'master' of https://github.com/marktwinkle/G53SQM.git

Conflicts:
	DataBase/src/Client.java
Merge branch 'master' of https://github.com/marktwinkle/G53SQM.git
Merge branch 'master' of https://github.com/marktwinkle/G53SQM.git
Extra file