test
Merge branch 'master' of https://github.com/choihy/SADI-Assignment1

Conflicts:
	bin/Server/Command.class
	src/Server/Command.java