have message code
Merge branch 'master' of github.com:cmarchini/P2P-Program

Conflicts:
	P2P-Project/bin/peer/Peer.class
	P2P-Project/src/peer/Peer.java
Merge branch 'master' of github.com:cmarchini/P2P-Program

Conflicts:
	P2P-Project/bin/peer/Client.class
	P2P-Project/bin/peer/Peer.class
	P2P-Project/bin/peer/Server.class
	P2P-Project/bin/peer/ServerConnection.class
	P2P-Project/src/peer/Peer.java