Resolve merge issue
Merge branch 'master' of /afs/athena.mit.edu/course/6/6.005/git/sp13/projects/guichat/bfaviero-czuo-pashamur
Added updated Design Document including Testing and Concurrency strategies.
working on stuff
all