a
Merge branch 'master' of https://github.com/Ahring0211/Assignment2_ChatRoom

Conflicts:

	build/classes/chatroom/client/ChatRoomClientController$btnListener.class
	build/classes/chatroom/client/ChatRoomClientController.class
	build/classes/chatroom/client/ChatRoomClientView.class
	build/classes/chatroom/server/ChatRoomController$btnListener.class
	build/classes/chatroom/server/ChatRoomView.class
	nbproject/private/private.properties