Incorporated ChatServer changes from scott commit 

a5e1ab4e36130783156fd82fbc0ad04fae99f141
Merge commit '2a35f3766ed94b6581a5e8cca7277e43a2daab7a'

Conflicts:
	eece411_A2Client/src/com/b6w7/eece411/Client/ChatClient.java
	eece411_A2Server/src/com/b6w7/eece411/Server/ChatServer.java