Delete extra blockingqueue
fix merge
Merge branch 'master' of /afs/athena.mit.edu/course/6/6.005/git/sp13/projects/guichat/bfaviero-czuo-pashamur
dummy addMessage to conversation implementation
no more joption pane
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/sp13/projects/guichat/bfaviero-czuo-pashamur
add removeUserFromChannel to server class
Merge branch 'master' of /afs/athena.mit.edu/course/6/6.005/git/sp13/projects/guichat/bfaviero-czuo-pashamur
add ChannelMonitor to watch for empty channels; implemented Channel removeUser and checkRepInvariant methods
remove extra lines