Test
Delete MainFrame.java
Test
Delete MainFrame.java
add room and emp
Merge remote-tracking branch 'origin/master'
Merge pull request #13 from shanyiming/master

add room and emp