Done (Preliminary) with ProxyServer
Merge branch 'master' of https://github.com/Chad-Barlow/CS340

Conflicts:
	Catan/java/src/client/model/ClientModel.java