change
Merge branch 'brian' of https://github.com/brianlu365/cs470proj3 into brian

Conflicts:
	ChatServer.rb
	gui.rb
	server.rb