.
Merge branch 'master' of https://github.com/spardue/computer-networking-project-4

Conflicts:
	bin/classes/clientlogic/ClientLogic.class
sanity commit