Merge branch 'master' of https://github.com/vmkf5/CS5600

Conflicts:
	src/client/Peer.java