Almost done making server/client
Merge branch 'master' of https://github.com/ajmagat/CS176B

Conflicts:
	src/ChatRoom.java