add emp and room, now is working!!! YEAH lol
add emp and room, now is working!!! YEAH lol
6:36 AM
Merge remote-tracking branch 'Master/master'

Conflicts:
	MeetingScheduler/src/scheduler/gui/SchedulerPanel.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	MeetingScheduler/src/scheduler/controller/Controller.java
	MeetingScheduler/src/scheduler/gui/AdministratorPanel.java
	MeetingScheduler/src/scheduler/gui/DelEmpDialog.java
	MeetingScheduler/src/scheduler/gui/DelRoomDialog.java
	MeetingScheduler/src/scheduler/gui/RoomDialog.java
	MeetingScheduler/src/scheduler/gui/SchedulerPanel.java
Merge pull request #22 from shanyiming/master

6:50AM