룸 패널 합침
Test 삭제
Merge remote-tracking branch 'origin/master'

Conflicts:
	SWEngineering/src/client/gui/TestRoomPanel.java