some random changes to debug thing
Some other changes
Merge some changes.
Merge branch 'master' of https://github.com/niranjanravi/Assignment-4
Try to get the client and server to work together better
More fixing
Fix a few more things -- now things work well
Fix a NPE
Merge pull request #18 from jcao219/master

some changes to everything