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

Conflicts:
	.classpath
	bin/DateUtils.class
	bin/FileChunk.class
	bin/LogFile.class
	bin/Message.class
	bin/Peer.class
	bin/PeerClientThread.class
	bin/PeerServerThread.class
	bin/peerProcess.class
	src/networkingproject/LogFile.java
	src/networkingproject/Message.java
	src/networkingproject/PeerClientThread.java
	src/networkingproject/PeerServerThread.java
	src/networkingproject/RemotePeerInfo.java
	src/networkingproject/StartRemotePeers.java
	src/networkingproject/peerProcess.java