Starting code.
Added Conversation model, inserted basic classes as discussed.
Add ChatServer.java.
added team contract
Conversation not abstract
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/sp13/projects/guichat/axc-cmobrien-ksiegel
Implemented (preliminary) GUI
Uploaded design milestone 1
added code for models
fixed model hashmap bug
minor edits to models
added diagram
Add server code.
Fix merge.
Finish up first draft of server code.
made client compatible with server
some more client-server interaction
added  ClientListeningThread class
I don't think I changed anything but it won't let me pull...
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/sp13/projects/guichat/axc-cmobrien-ksiegel