Can read ints and shorts, strings are still an issue
Merge branch 'master' into networkSpeed

Conflicts:
	src/com/tsp/client/ClientMain.java
Merge branch 'development' into networkSpeed
Merge branch 'networkSpeed' of github.com:btaidm/TSP-Project into networkSpeeds

Conflicts:
	src/com/tsp/client/controller/ConnectionController.java
	src/com/tsp/client/controller/TCPClient.java
	src/com/tsp/server/controller/TCP/clientThread.java