Quarter way done with Mock Communicator
Merge branch 'master' of https://github.com/Chad-Barlow/CS340

Conflicts:
	Catan/java/src/proxy/junit/ServerProxyTest.java