message stuffs
message stuff

Merge branch 'master' of https://github.com/mothalit/PeerToPeer

Conflicts:
	src/networkingproject/Peer.java
	src/networkingproject/PeerClientThread.java