Sam Looking Over Code in New Repo
Merge origin/master

Conflicts:
	build.xml
	manifest.mf
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/CM3033Tests/Client.java
	src/CM3033Tests/ClientApp.form
	src/CM3033Tests/ClientApp.java
	src/CM3033Tests/DataShare.java
	src/CM3033Tests/MyRejectedExecutionHandlerImpl.java
	src/CM3033Tests/Server.java
	src/CM3033Tests/ServerApp.form
	src/CM3033Tests/ServerApp.java
	src/CM3033Tests/StartServer.java
	src/CM3033Tests/TestClientStart.java
Merge origin/master into samWORKING
WORKING VERSION 2 - BPM sent to server but timeout disconnects after 3 missed messages. Not 1
WORKING VERSION 2 - BPM sent to server but timeout takes to long
Merge origin/samWORKING into masterWORKING
WORKING VERSION 2 - BPM sent to server but timeout takes to long added to Florins